]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
sd: implement unmapping Write Zeroes
authorChristoph Hellwig <hch@lst.de>
Wed, 5 Apr 2017 17:21:12 +0000 (19:21 +0200)
committerJens Axboe <axboe@fb.com>
Sat, 8 Apr 2017 17:25:38 +0000 (11:25 -0600)
Try to use a write same with unmap bit variant if the device supports it
and the caller allows for it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/scsi/sd.c

index d8d9c0bdd93c34b8a880d758f13a934afb35d7b5..001593ed04449fb83d1d280649d723be55af3ac7 100644 (file)
@@ -803,6 +803,15 @@ static int sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd)
        u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9);
        u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
 
+       if (!(rq->cmd_flags & REQ_NOUNMAP)) {
+               switch (sdkp->provisioning_mode) {
+               case SD_LBP_WS16:
+                       return sd_setup_write_same16_cmnd(cmd, true);
+               case SD_LBP_WS10:
+                       return sd_setup_write_same10_cmnd(cmd, true);
+               }
+       }
+
        if (sdp->no_write_same)
                return BLKPREP_INVALID;
        if (sdkp->ws16 || sector > 0xffffffff || nr_sectors > 0xffff)