nfsd: don't advertise a SCSI layout for an unsupported request_queue
authorBenjamin Coddington <bcodding@redhat.com>
Tue, 19 Jun 2018 08:57:24 +0000 (04:57 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 19 Jun 2018 14:12:31 +0000 (10:12 -0400)
commit8163496e78db100a6b5cfbdaece385686ae50129
tree10d7798429edd25a56fb8769c18ddbfebf30aa0c
parent5b7b15aee641904ae269be9846610a3950cbd64c
nfsd: don't advertise a SCSI layout for an unsupported request_queue

Commit 30181faae37f ("nfsd: Check queue type before submitting a SCSI
request") did the work of ensuring that we don't send SCSI requests to a
request queue that won't support them, but that check is in the
GETDEVICEINFO path.  Let's not set the SCSI layout in fs_layout_type in the
first place, and then we'll have less clients sending GETDEVICEINFO for
non-SCSI request queues and less unnecessary WARN_ONs.

While we're in here, remove some outdated comments that refer to
"overwriting" layout seletion because commit 8a4c3926889e ("nfsd: allow
nfsd to advertise multiple layout types") changed things to no longer
overwrite the layout type.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4layouts.c