summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/blocklayout.c
diff options
context:
space:
mode:
authorChristoph Hellwig2017-04-20 16:03:01 +0200
committerJens Axboe2017-04-20 20:16:10 +0200
commit17d5363b83f8c73ef9109f75a4a9b578f31d842f (patch)
tree07eabf4d2ef1bbba0f5db8dcd8dba4178b5f502c /fs/nfsd/blocklayout.c
parentvirtio_blk: don't use req->errors (diff)
downloadkernel-qcow2-linux-17d5363b83f8c73ef9109f75a4a9b578f31d842f.tar.gz
kernel-qcow2-linux-17d5363b83f8c73ef9109f75a4a9b578f31d842f.tar.xz
kernel-qcow2-linux-17d5363b83f8c73ef9109f75a4a9b578f31d842f.zip
scsi: introduce a result field in struct scsi_request
This passes on the scsi_cmnd result field to users of passthrough requests. Currently we abuse req->errors for this purpose, but that field will go away in its current form. Note that the old IDE code abuses the errors field in very creative ways and stores all kinds of different values in it. I didn't dare to touch this magic, so the abuses are brought forward 1:1. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/nfsd/blocklayout.c')
-rw-r--r--fs/nfsd/blocklayout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index 9f618b77ffee..fb5213afc854 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -243,9 +243,9 @@ static int nfsd4_scsi_identify_device(struct block_device *bdev,
req->cmd_len = COMMAND_SIZE(INQUIRY);
blk_execute_rq(rq->q, NULL, rq, 1);
- if (rq->errors) {
+ if (req->result) {
pr_err("pNFS: INQUIRY 0x83 failed with: %x\n",
- rq->errors);
+ req->result);
error = -EIO;
goto out_put_request;
}