From: Ye Bin yebin10@huawei.com
hulk inclusion category: bugfix bugzilla: NA CVE: NA
-----------------------------------------------
This reverts commit 4b45cdf515cc8c252aeca00656767e7c1359dc57.
Signed-off-by: Ye Bin yebin10@huawei.com Reviewed-by: Jason Yan yanaijie@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/scsi/sd.c | 6 +++--- include/scsi/scsi.h | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 5fa02f8261cba..4e89a7b499bd3 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2651,18 +2651,18 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer) * 5: Illegal Request, Sense Code 24: Invalid field in * CDB. */ - if (!scsi_result_is_good(res)) + if (!scsi_status_is_good(res)) res = sd_do_mode_sense(sdp, 0, 0, buffer, 4, &data, NULL);
/* * Third attempt: ask 255 bytes, as we did earlier. */ - if (!scsi_result_is_good(res)) + if (!scsi_status_is_good(res)) res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 255, &data, NULL); }
- if (!scsi_result_is_good(res)) { + if (!scsi_status_is_good(res)) { sd_first_printk(KERN_WARNING, sdkp, "Test WP failed, assume Write Enabled\n"); } else { diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index f6c2dedd7f8c9..eb7853c1a23b8 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -55,19 +55,6 @@ static inline int scsi_status_is_good(int status) (status == SAM_STAT_COMMAND_TERMINATED)); }
-/** scsi_result_is_good - check the result return. - * - * @result: the result passed up from the driver (including host and - * driver components) - * - * Drivers may only set other bytes but not status byte. - * This checks both the status byte and other bytes. - */ -static inline int scsi_result_is_good(int result) -{ - return scsi_status_is_good(result) && (result & ~0xff) == 0; -} -
/* * standard mode-select header prepended to all mode-select commands