diff options
| author | Keith Busch <kbusch@kernel.org> | 2025-11-05 17:54:44 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-11-06 16:27:21 -0700 |
| commit | 1165d20f4d1abba59ff2f032df271605ad49c255 (patch) | |
| tree | 860fb50f77b8bb0b9478a74a7cafd6d3853a3d95 /drivers/block/null_blk | |
| parent | e87d66ab27ac89494b75ddc3fed697b5aa8417f1 (diff) | |
null_blk: simplify copy_from_nullb
It always returns success, so the code that saves the errors status, but
proceeds without checking it looks a bit odd. Clean this up.
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Tested-by: Hans Holmberg <hans.holmberg@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/null_blk')
| -rw-r--r-- | drivers/block/null_blk/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index f982027e8c85..e2597ea696bf 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -1161,7 +1161,7 @@ static int copy_to_nullb(struct nullb *nullb, struct page *source, return 0; } -static int copy_from_nullb(struct nullb *nullb, struct page *dest, +static void copy_from_nullb(struct nullb *nullb, struct page *dest, unsigned int off, sector_t sector, size_t n) { size_t temp, count = 0; @@ -1184,7 +1184,6 @@ static int copy_from_nullb(struct nullb *nullb, struct page *dest, count += temp; sector += temp >> SECTOR_SHIFT; } - return 0; } static void nullb_fill_pattern(struct nullb *nullb, struct page *page, @@ -1248,8 +1247,8 @@ static int null_transfer(struct nullb *nullb, struct page *page, sector, len); if (valid_len) { - err = copy_from_nullb(nullb, page, off, - sector, valid_len); + copy_from_nullb(nullb, page, off, sector, + valid_len); off += valid_len; len -= valid_len; } |