| Message ID | 1422607337-25335-3-git-send-email-den@openvz.org |
|---|---|
| State | New |
| Headers | show |
Am 30.01.2015 um 09:42 schrieb Denis V. Lunev: > The pattern > do { > if (fallocate(s->fd, mode, offset, len) == 0) { > return 0; > } > } while (errno == EINTR); > ret = translate_err(-errno); > will be commonly useful in next patches. Create helper for it. > > Signed-off-by: Denis V. Lunev <den@openvz.org> > Reviewed-by: Max Reitz <mreitz@redhat.com> > CC: Kevin Wolf <kwolf@redhat.com> > CC: Stefan Hajnoczi <stefanha@redhat.com> > CC: Peter Lieven <pl@kamp.de> > CC: Fam Zheng <famz@redhat.com> > --- > block/raw-posix.c | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/block/raw-posix.c b/block/raw-posix.c > index 24300d0..2aa268a 100644 > --- a/block/raw-posix.c > +++ b/block/raw-posix.c > @@ -902,6 +902,18 @@ static int translate_err(int err) > return err; > } > > +#if defined(CONFIG_FALLOCATE_PUNCH_HOLE) > +static int do_fallocate(int fd, int mode, off_t offset, off_t len) > +{ > + do { > + if (fallocate(fd, mode, offset, len) == 0) { > + return 0; > + } > + } while (errno == EINTR); > + return translate_err(-errno); > +} > +#endif > + > static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb) > { > int ret = -EOPNOTSUPP; > @@ -965,14 +977,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) > #endif > > #ifdef CONFIG_FALLOCATE_PUNCH_HOLE > - do { > - if (fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, > - aiocb->aio_offset, aiocb->aio_nbytes) == 0) { > - return 0; > - } > - } while (errno == EINTR); > - > - ret = -errno; > + ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, > + aiocb->aio_offset, aiocb->aio_nbytes); You also introduce the conversion via translate_err here. Is that ok? Peter
On 30/01/15 11:47, Peter Lieven wrote: > Am 30.01.2015 um 09:42 schrieb Denis V. Lunev: >> The pattern >> do { >> if (fallocate(s->fd, mode, offset, len) == 0) { >> return 0; >> } >> } while (errno == EINTR); >> ret = translate_err(-errno); >> will be commonly useful in next patches. Create helper for it. >> >> Signed-off-by: Denis V. Lunev <den@openvz.org> >> Reviewed-by: Max Reitz <mreitz@redhat.com> >> CC: Kevin Wolf <kwolf@redhat.com> >> CC: Stefan Hajnoczi <stefanha@redhat.com> >> CC: Peter Lieven <pl@kamp.de> >> CC: Fam Zheng <famz@redhat.com> >> --- >> block/raw-posix.c | 22 ++++++++++++++-------- >> 1 file changed, 14 insertions(+), 8 deletions(-) >> >> diff --git a/block/raw-posix.c b/block/raw-posix.c >> index 24300d0..2aa268a 100644 >> --- a/block/raw-posix.c >> +++ b/block/raw-posix.c >> @@ -902,6 +902,18 @@ static int translate_err(int err) >> return err; >> } >> >> +#if defined(CONFIG_FALLOCATE_PUNCH_HOLE) >> +static int do_fallocate(int fd, int mode, off_t offset, off_t len) >> +{ >> + do { >> + if (fallocate(fd, mode, offset, len) == 0) { >> + return 0; >> + } >> + } while (errno == EINTR); >> + return translate_err(-errno); >> +} >> +#endif >> + >> static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb) >> { >> int ret = -EOPNOTSUPP; >> @@ -965,14 +977,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) >> #endif >> >> #ifdef CONFIG_FALLOCATE_PUNCH_HOLE >> - do { >> - if (fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, >> - aiocb->aio_offset, aiocb->aio_nbytes) == 0) { >> - return 0; >> - } >> - } while (errno == EINTR); >> - >> - ret = -errno; >> + ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, >> + aiocb->aio_offset, aiocb->aio_nbytes); > You also introduce the conversion via translate_err here. Is that ok? > > Peter > yes, this is redundant but harmless
Am 30.01.2015 um 09:49 schrieb Denis V. Lunev: > On 30/01/15 11:47, Peter Lieven wrote: >> Am 30.01.2015 um 09:42 schrieb Denis V. Lunev: >>> The pattern >>> do { >>> if (fallocate(s->fd, mode, offset, len) == 0) { >>> return 0; >>> } >>> } while (errno == EINTR); >>> ret = translate_err(-errno); >>> will be commonly useful in next patches. Create helper for it. >>> >>> Signed-off-by: Denis V. Lunev <den@openvz.org> >>> Reviewed-by: Max Reitz <mreitz@redhat.com> >>> CC: Kevin Wolf <kwolf@redhat.com> >>> CC: Stefan Hajnoczi <stefanha@redhat.com> >>> CC: Peter Lieven <pl@kamp.de> >>> CC: Fam Zheng <famz@redhat.com> >>> --- >>> block/raw-posix.c | 22 ++++++++++++++-------- >>> 1 file changed, 14 insertions(+), 8 deletions(-) >>> >>> diff --git a/block/raw-posix.c b/block/raw-posix.c >>> index 24300d0..2aa268a 100644 >>> --- a/block/raw-posix.c >>> +++ b/block/raw-posix.c >>> @@ -902,6 +902,18 @@ static int translate_err(int err) >>> return err; >>> } >>> +#if defined(CONFIG_FALLOCATE_PUNCH_HOLE) >>> +static int do_fallocate(int fd, int mode, off_t offset, off_t len) >>> +{ >>> + do { >>> + if (fallocate(fd, mode, offset, len) == 0) { >>> + return 0; >>> + } >>> + } while (errno == EINTR); >>> + return translate_err(-errno); >>> +} >>> +#endif >>> + >>> static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb) >>> { >>> int ret = -EOPNOTSUPP; >>> @@ -965,14 +977,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) >>> #endif >>> #ifdef CONFIG_FALLOCATE_PUNCH_HOLE >>> - do { >>> - if (fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, >>> - aiocb->aio_offset, aiocb->aio_nbytes) == 0) { >>> - return 0; >>> - } >>> - } while (errno == EINTR); >>> - >>> - ret = -errno; >>> + ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, >>> + aiocb->aio_offset, aiocb->aio_nbytes); >> You also introduce the conversion via translate_err here. Is that ok? >> >> Peter >> > yes, this is redundant but harmless Ok, then please add: Reviewed-by: Peter Lieven <pl@kamp.de>
diff --git a/block/raw-posix.c b/block/raw-posix.c index 24300d0..2aa268a 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -902,6 +902,18 @@ static int translate_err(int err) return err; } +#if defined(CONFIG_FALLOCATE_PUNCH_HOLE) +static int do_fallocate(int fd, int mode, off_t offset, off_t len) +{ + do { + if (fallocate(fd, mode, offset, len) == 0) { + return 0; + } + } while (errno == EINTR); + return translate_err(-errno); +} +#endif + static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb) { int ret = -EOPNOTSUPP; @@ -965,14 +977,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) #endif #ifdef CONFIG_FALLOCATE_PUNCH_HOLE - do { - if (fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, - aiocb->aio_offset, aiocb->aio_nbytes) == 0) { - return 0; - } - } while (errno == EINTR); - - ret = -errno; + ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, + aiocb->aio_offset, aiocb->aio_nbytes); #endif }
The pattern do { if (fallocate(s->fd, mode, offset, len) == 0) { return 0; } } while (errno == EINTR); ret = translate_err(-errno); will be commonly useful in next patches. Create helper for it. Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Max Reitz <mreitz@redhat.com> CC: Kevin Wolf <kwolf@redhat.com> CC: Stefan Hajnoczi <stefanha@redhat.com> CC: Peter Lieven <pl@kamp.de> CC: Fam Zheng <famz@redhat.com> --- block/raw-posix.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)