Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a90dfdc2 authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

scsi: sd: sd_zbc: Rename sd_zbc_setup_write_cmnd 



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: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarBart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2908769c

drivers/scsi/sd.c

+3 −3
Original line number Diff line number Diff line
@@ -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);



	if (sd_is_zoned(sdkp)) {

		ret = sd_zbc_setup_write_cmnd(cmd);

		ret = sd_zbc_write_lock_zone(cmd);

		if (ret != BLKPREP_OK)

			return ret;

	}
@@ -918,7 +918,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt) 
	unsigned char protect;



	if (zoned_write) {

		ret = sd_zbc_setup_write_cmnd(SCpnt);

		ret = sd_zbc_write_lock_zone(SCpnt);

		if (ret != BLKPREP_OK)

			return ret;

	}
@@ -1145,7 +1145,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt) 
	ret = BLKPREP_OK;

 out:

	if (zoned_write && ret != BLKPREP_OK)

		sd_zbc_cancel_write_cmnd(SCpnt);

		sd_zbc_write_unlock_zone(SCpnt);



	return ret;

}

drivers/scsi/sd.h

+4 −4
Original line number Diff line number Diff line
@@ -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 void sd_zbc_remove(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 void sd_zbc_cancel_write_cmnd(struct scsi_cmnd *cmd);

extern int sd_zbc_write_lock_zone(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_reset_cmnd(struct scsi_cmnd *cmd);

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 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 */

	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)

{

drivers/scsi/sd_zbc.c

+4 −8
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd) 
	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 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;

}



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);



	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,

		     unsigned int good_bytes,

		     struct scsi_sense_hdr *sshdr)
@@ -333,7 +329,7 @@ void sd_zbc_complete(struct scsi_cmnd *cmd, 
	case REQ_OP_ZONE_RESET:



		/* Unlock the zone */

		sd_zbc_unlock_zone(rq);

		sd_zbc_write_unlock_zone(cmd);



		if (!result ||

		    sshdr->sense_key != ILLEGAL_REQUEST)