summaryrefslogtreecommitdiffstats
path: root/block/blk-timeout.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-08 20:57:40 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-12-16 17:53:39 +0100
commit9f8a2c23c6c1140f515f601265c4dff7522110b7 (patch)
tree6defb41e4b129c3772e0c6d40b5e8e9a29bea7f0 /block/blk-timeout.c
parent638428ece619495edc9579b1e21493eb00f9687c (diff)
downloadop-kernel-dev-9f8a2c23c6c1140f515f601265c4dff7522110b7.zip
op-kernel-dev-9f8a2c23c6c1140f515f601265c4dff7522110b7.tar.gz
scsi: replace sr_test_unit_ready() with scsi_test_unit_ready()
The usage of TUR has been confusing involving several different commits updating different parts over time. Currently, the only differences between scsi_test_unit_ready() and sr_test_unit_ready() are, * scsi_test_unit_ready() also sets sdev->changed on NOT_READY. * scsi_test_unit_ready() returns 0 if TUR ended with UNIT_ATTENTION or NOT_READY. Due to the above two differences, sr is using its own sr_test_unit_ready(), but sd - the sole user of the above extra handling - doesn't even need them. Where scsi_test_unit_ready() is used in sd_media_changed(), the code is looking for device ready w/ media present state which is true iff TUR succeeds w/o sense data or UA, and when the device is not ready for whatever reason sd_media_changed() explicitly marks media as missing so there's no reason to set sdev->changed automatically from scsi_test_unit_ready() on NOT_READY. Drop both special handlings from scsi_test_unit_ready(), which makes it equivalant to sr_test_unit_ready(), and replace sr_test_unit_ready() with scsi_test_unit_ready(). Also, drop the unnecessary explicit NOT_READY check from sd_media_changed(). Checking return value is enough for testing device readiness. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud