From 04f59030789e2d280c0dda66d5ccde836af26428 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Mon, 13 Feb 2012 15:39:00 -0500 Subject: [PATCH] --- yaml --- r: 292973 b: refs/heads/master c: 89730393f260aef7fce9f6fd475da148517a4c5c h: refs/heads/master i: 292971: 939023a8631179c0a58f76be6d8250ebb761407c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a8aa5f17d434..715bb8e45c03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66a651aa7a48b7c6181aff556937454c87bb9feb +refs/heads/master: 89730393f260aef7fce9f6fd475da148517a4c5c diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index c691fb50e6cb..8c525aa1b858 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -497,6 +497,8 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode) max(sdkp->physical_block_size, sdkp->unmap_granularity * logical_block_size); + sdkp->provisioning_mode = mode; + switch (mode) { case SD_LBP_DISABLE: @@ -524,8 +526,6 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode) q->limits.max_discard_sectors = max_blocks * (logical_block_size >> 9); queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); - - sdkp->provisioning_mode = mode; } /**