From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5szT-0003X0-NS for qemu-devel@nongnu.org; Tue, 30 Dec 2014 04:21:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y5szQ-00045h-Ht for qemu-devel@nongnu.org; Tue, 30 Dec 2014 04:21:23 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:8525 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5szP-0003xX-I2 for qemu-devel@nongnu.org; Tue, 30 Dec 2014 04:21:20 -0500 From: "Denis V. Lunev" Date: Tue, 30 Dec 2014 12:20:46 +0300 Message-Id: <1419931250-19259-5-git-send-email-den@openvz.org> In-Reply-To: <1419931250-19259-1-git-send-email-den@openvz.org> References: <1419931250-19259-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 4/8] block/raw-posix: create translate_err helper to merge errno values List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , Peter Lieven , qemu-devel@nongnu.org, Stefan Hajnoczi actually the code if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP || ret == -ENOTTY) { ret = -ENOTSUP; } is present twice and will be added a couple more times. Create helper for this. Place it into do_fallocate() for further convinience. Signed-off-by: Denis V. Lunev CC: Kevin Wolf CC: Stefan Hajnoczi CC: Peter Lieven --- block/raw-posix.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index a7c8816..25a6947 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -894,6 +894,15 @@ static int xfs_discard(BDRVRawState *s, int64_t offset, uint64_t bytes) #endif +static int translate_err(int err) +{ + if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP || + err == -ENOTTY) { + err = -ENOTSUP; + } + return err; +} + #if defined(CONFIG_FALLOCATE_PUNCH_HOLE) || defined(CONFIG_FALLOCATE_ZERO_RANGE) static int do_fallocate(int fd, int mode, off_t offset, off_t len) { @@ -902,7 +911,7 @@ static int do_fallocate(int fd, int mode, off_t offset, off_t len) return 0; } } while (errno == EINTR); - return -errno; + return translate_err(-errno); } #endif @@ -939,10 +948,9 @@ static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb) #endif } - if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP || - ret == -ENOTTY) { + ret = translate_err(ret); + if (ret == -ENOTSUP) { s->has_write_zeroes = false; - ret = -ENOTSUP; } return ret; } @@ -980,10 +988,9 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) #endif } - if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP || - ret == -ENOTTY) { + ret = translate_err(ret); + if (ret == -ENOTSUP) { s->has_discard = false; - ret = -ENOTSUP; } return ret; } -- 1.9.1