xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: sd: sd_zbc: Rename sd_zbc_setup_write_cmnd

Browse Source 
Rename sd_zbc_setup_write_cmnd() to sd_zbc_write_lock_zone() to be clear
about what the function actually does. To be consistent, also rename
sd_zbc_cancel_write_cmnd() to sd_zbc_write_unlock_zone().

No functional change is introduced by this patch.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Damien Le Moal
2017-04-24 16:51:13 +09:00
committed by Martin K. Petersen
parent 2908769c35
commit a90dfdc2de
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/sd.c
View File

@@ -846,7 +846,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size); BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size);
if (sd_is_zoned(sdkp)) { if (sd_is_zoned(sdkp)) {
ret = sd_zbc_setup_write_cmnd(cmd); ret = sd_zbc_write_lock_zone(cmd);
if (ret != BLKPREP_OK) if (ret != BLKPREP_OK)
return ret; return ret;
} }
@@ -918,7 +918,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
unsigned char protect; unsigned char protect;
if (zoned_write) { if (zoned_write) {
ret = sd_zbc_setup_write_cmnd(SCpnt); ret = sd_zbc_write_lock_zone(SCpnt);
if (ret != BLKPREP_OK) if (ret != BLKPREP_OK)
return ret; return ret;
} }
@@ -1145,7 +1145,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
ret = BLKPREP_OK; ret = BLKPREP_OK;
out: out:
if (zoned_write && ret != BLKPREP_OK) if (zoned_write && ret != BLKPREP_OK)
sd_zbc_cancel_write_cmnd(SCpnt); sd_zbc_write_unlock_zone(SCpnt);
return ret; return ret;
} }

8
drivers/scsi/sd.h
View File

@@ -272,8 +272,8 @@ static inline int sd_is_zoned(struct scsi_disk *sdkp)
extern int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buffer); extern int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buffer);
extern void sd_zbc_remove(struct scsi_disk *sdkp); extern void sd_zbc_remove(struct scsi_disk *sdkp);
extern void sd_zbc_print_zones(struct scsi_disk *sdkp); extern void sd_zbc_print_zones(struct scsi_disk *sdkp);
extern int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd); extern int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd);
extern void sd_zbc_cancel_write_cmnd(struct scsi_cmnd *cmd); extern void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd);
extern int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd); extern int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd);
extern int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd); extern int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd);
extern void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes, extern void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes,
@@ -291,13 +291,13 @@ static inline void sd_zbc_remove(struct scsi_disk *sdkp) {}
static inline void sd_zbc_print_zones(struct scsi_disk *sdkp) {} static inline void sd_zbc_print_zones(struct scsi_disk *sdkp) {}
static inline int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd) static inline int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd)
{ {
/* Let the drive fail requests */ /* Let the drive fail requests */
return BLKPREP_OK; return BLKPREP_OK;
} }
static inline void sd_zbc_cancel_write_cmnd(struct scsi_cmnd *cmd) {} static inline void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd) {}
static inline int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd) static inline int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd)
{ {

12
drivers/scsi/sd_zbc.c
View File

@@ -269,7 +269,7 @@ int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd)
return BLKPREP_OK; return BLKPREP_OK;
} }
int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd) int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd)
{ {
struct request *rq = cmd->request; struct request *rq = cmd->request;
struct scsi_disk *sdkp = scsi_disk(rq->rq_disk); struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
@@ -303,8 +303,9 @@ int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd)
return BLKPREP_OK; return BLKPREP_OK;
} }
static void sd_zbc_unlock_zone(struct request *rq) void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd)
{ {
struct request *rq = cmd->request;
struct scsi_disk *sdkp = scsi_disk(rq->rq_disk); struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
if (sdkp->zones_wlock) { if (sdkp->zones_wlock) {
@@ -315,11 +316,6 @@ static void sd_zbc_unlock_zone(struct request *rq)
} }
} }
void sd_zbc_cancel_write_cmnd(struct scsi_cmnd *cmd)
{
sd_zbc_unlock_zone(cmd->request);
}
void sd_zbc_complete(struct scsi_cmnd *cmd, void sd_zbc_complete(struct scsi_cmnd *cmd,
unsigned int good_bytes, unsigned int good_bytes,
struct scsi_sense_hdr *sshdr) struct scsi_sense_hdr *sshdr)
@@ -333,7 +329,7 @@ void sd_zbc_complete(struct scsi_cmnd *cmd,
case REQ_OP_ZONE_RESET: case REQ_OP_ZONE_RESET:
/* Unlock the zone */ /* Unlock the zone */
sd_zbc_unlock_zone(rq); sd_zbc_write_unlock_zone(cmd);
if (!result || if (!result ||
sshdr->sense_key != ILLEGAL_REQUEST) sshdr->sense_key != ILLEGAL_REQUEST)