[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20200208064234.4824-1-zbestahu@163.com>
Date: Sat, 8 Feb 2020 14:42:34 +0800
From: Yue Hu <zbestahu@....com>
To: minchan@...nel.org, ngupta@...are.org,
sergey.senozhatsky.work@...il.com
Cc: linux-kernel@...r.kernel.org, huyue2@...ong.com,
Yue Hu <zbestahu@....com>
Subject: [PATCH] drivers/block/zram/zram_drv.c: remove ret check for invalid io request
There is no need to goto out to check ret if it's an invalid io request
since we know ret = -EINVAL. Let's return the error directly in that
case.
Signed-off-by: Yue Hu <zbestahu@....com>
---
drivers/block/zram/zram_drv.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 1bdb5793842b..bdca06930504 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1639,8 +1639,7 @@ static int zram_rw_page(struct block_device *bdev, sector_t sector,
if (!valid_io_request(zram, sector, PAGE_SIZE)) {
atomic64_inc(&zram->stats.invalid_io);
- ret = -EINVAL;
- goto out;
+ return -EINVAL;
}
index = sector >> SECTORS_PER_PAGE_SHIFT;
@@ -1651,7 +1650,7 @@ static int zram_rw_page(struct block_device *bdev, sector_t sector,
bv.bv_offset = 0;
ret = zram_bvec_rw(zram, &bv, index, offset, op, NULL);
-out:
+
/*
* If I/O fails, just return error(ie, non-zero) without
* calling page_endio.
--
2.11.0
Powered by blists - more mailing lists