summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2017-09-07 21:12:43 +0200
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2017-09-07 21:12:43 +0200
commit2441500a41a9b17ff657626eb81972f62bc8cc5a (patch)
treea73d114149de8daa1da3713d4048930ba7421384 /drivers/scsi/sd.c
parentscsi: scsi-mq: Always unprepare before requeuing a request (diff)
parentscsi: qla2xxx: Fix an integer overflow in sysfs code (diff)
downloadlinux-2441500a41a9b17ff657626eb81972f62bc8cc5a.tar.xz
linux-2441500a41a9b17ff657626eb81972f62bc8cc5a.zip
Merge branch 'fixes' into misc
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6549e5ce09ca..11c1738c2100 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1277,6 +1277,9 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt)
{
struct request *rq = SCpnt->request;
+ if (SCpnt->flags & SCMD_ZONE_WRITE_LOCK)
+ sd_zbc_write_unlock_zone(SCpnt);
+
if (rq->rq_flags & RQF_SPECIAL_PAYLOAD)
__free_page(rq->special_vec.bv_page);