From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH7Hz-0000Lv-6V for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:50:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YH7Hv-0005Kp-5M for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:50:55 -0500 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:41912 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH7Hu-0005Kl-Pn for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:50:51 -0500 Message-ID: <54CB45E7.9020608@kamp.de> Date: Fri, 30 Jan 2015 09:50:47 +0100 From: Peter Lieven 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> <54CB45A0.2040009@openvz.org> In-Reply-To: <54CB45A0.2040009@openvz.org> Content-Type: text/plain; charset=iso-8859-15 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: "Denis V. Lunev" Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Stefan Hajnoczi 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 >>> 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 Ok, then please add: Reviewed-by: Peter Lieven