---

yaml --- r: 292973 b: refs/heads/master c: 8973039 h: refs/heads/master i: 292971: 939023a v: v3
git-mirror · Feb 19, 2012 · 04f5903 · 04f5903
1 parent ff05b99
commit 04f5903
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 }
 
 /**