tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

null_blk: consistently use blk_status_t

No need to mix errno and blk_status_t error types. Just use the standard
block layer type.

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>

authored by

Keith Busch and committed by
Jens Axboe 84592838 1165d20f

+7 -7
+7 -7
drivers/block/null_blk/main.c
··· 1129 1129 return 0; 1130 1130 } 1131 1131 1132 - static int copy_to_nullb(struct nullb *nullb, struct page *source, 1132 + static blk_status_t copy_to_nullb(struct nullb *nullb, struct page *source, 1133 1133 unsigned int off, sector_t sector, size_t n, bool is_fua) 1134 1134 { 1135 1135 size_t temp, count = 0; ··· 1146 1146 t_page = null_insert_page(nullb, sector, 1147 1147 !null_cache_active(nullb) || is_fua); 1148 1148 if (!t_page) 1149 - return -ENOSPC; 1149 + return BLK_STS_NOSPC; 1150 1150 1151 1151 memcpy_page(t_page->page, offset, source, off + count, temp); 1152 1152 ··· 1158 1158 count += temp; 1159 1159 sector += temp >> SECTOR_SHIFT; 1160 1160 } 1161 - return 0; 1161 + return BLK_STS_OK; 1162 1162 } 1163 1163 1164 1164 static void copy_from_nullb(struct nullb *nullb, struct page *dest, ··· 1233 1233 return errno_to_blk_status(err); 1234 1234 } 1235 1235 1236 - static int null_transfer(struct nullb *nullb, struct page *page, 1236 + static blk_status_t null_transfer(struct nullb *nullb, struct page *page, 1237 1237 unsigned int len, unsigned int off, bool is_write, sector_t sector, 1238 1238 bool is_fua) 1239 1239 { 1240 1240 struct nullb_device *dev = nullb->dev; 1241 + blk_status_t err = BLK_STS_OK; 1241 1242 unsigned int valid_len = len; 1242 - int err = 0; 1243 1243 1244 1244 if (!is_write) { 1245 1245 if (dev->zoned) ··· 1273 1273 { 1274 1274 struct request *rq = blk_mq_rq_from_pdu(cmd); 1275 1275 struct nullb *nullb = cmd->nq->dev->nullb; 1276 - int err = 0; 1276 + blk_status_t err = BLK_STS_OK; 1277 1277 unsigned int len; 1278 1278 sector_t sector = blk_rq_pos(rq); 1279 1279 unsigned int max_bytes = nr_sectors << SECTOR_SHIFT; ··· 1298 1298 } 1299 1299 spin_unlock_irq(&nullb->lock); 1300 1300 1301 - return errno_to_blk_status(err); 1301 + return err; 1302 1302 } 1303 1303 1304 1304 static inline blk_status_t null_handle_throttled(struct nullb_cmd *cmd)