summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-04-20 10:02:55 -0400
committerJens Axboe <axboe@fb.com>2017-04-20 14:16:10 -0400
commitb7819b9259185dcdcc81eb32182a4dc13d695738 (patch)
tree96d76ffadf2718b65faf6004b734ed6b094f30ae /fs
parent75a500ef6ecb6266d4d1347fc7eb4b298b566b3b (diff)
block: remove the blk_execute_rq return value
The function only returns -EIO if rq->errors is non-zero, which is not very useful and lets a large number of callers ignore the return value. Just let the callers figure out their error themselves. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/blocklayout.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index 92b4b41d19d2..9f618b77ffee 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -242,10 +242,11 @@ static int nfsd4_scsi_identify_device(struct block_device *bdev,
242 req->cmd[4] = bufflen & 0xff; 242 req->cmd[4] = bufflen & 0xff;
243 req->cmd_len = COMMAND_SIZE(INQUIRY); 243 req->cmd_len = COMMAND_SIZE(INQUIRY);
244 244
245 error = blk_execute_rq(rq->q, NULL, rq, 1); 245 blk_execute_rq(rq->q, NULL, rq, 1);
246 if (error) { 246 if (rq->errors) {
247 pr_err("pNFS: INQUIRY 0x83 failed with: %x\n", 247 pr_err("pNFS: INQUIRY 0x83 failed with: %x\n",
248 rq->errors); 248 rq->errors);
249 error = -EIO;
249 goto out_put_request; 250 goto out_put_request;
250 } 251 }
251 252