From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH7Gv-0007Us-IR for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:49:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YH7Gr-0004s4-DT for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:49:49 -0500 Received: from mx2.parallels.com ([199.115.105.18]:39115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH7Gr-0004ry-7h for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:49:45 -0500 Message-ID: <54CB45A0.2040009@openvz.org> Date: Fri, 30 Jan 2015 11:49:36 +0300 From: "Denis V. Lunev" MIME-Version: 1.0 References: <1422607337-25335-1-git-send-email-den@openvz.org> <1422607337-25335-3-git-send-email-den@openvz.org> <54CB450C.7040106@kamp.de> In-Reply-To: <54CB450C.7040106@kamp.de> Content-Type: text/plain; charset="iso-8859-15"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/7] block/raw-posix: create do_fallocate helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Stefan Hajnoczi 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 >> Reviewed-by: Max Reitz >> CC: Kevin Wolf >> CC: Stefan Hajnoczi >> CC: Peter Lieven >> CC: Fam Zheng >> --- >> 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