From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YG6Yh-0006YB-Sm for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:52:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YG6Yd-00059z-AB for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:51:59 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:20803 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YG6Yc-00058o-Tw for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:51:55 -0500 From: "Denis V. Lunev" Date: Tue, 27 Jan 2015 16:51:34 +0300 Message-Id: <1422366699-17473-3-git-send-email-den@openvz.org> In-Reply-To: <1422366699-17473-1-git-send-email-den@openvz.org> References: <1422366699-17473-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 2/7] block/raw-posix: create do_fallocate helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , Peter Lieven , qemu-devel@nongnu.org, Stefan Hajnoczi , "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 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); #endif } -- 1.9.1