---

yaml --- r: 276691 b: refs/heads/master c: dfaf3c0 h: refs/heads/master i: 276689: abb50aa 276687: 2e085dd v: v3
git-mirror · Dec 2, 2011 · 1dd55a6 · 1dd55a6
1 parent d6df632
commit 1dd55a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eb46851de3904cd1be9192fdacb8d34deadc1fc
+refs/heads/master: dfaf3c036cd46a73f4ef3e4b75c1f647e503d4e1
diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c
@@ -797,7 +797,7 @@ static void loop_config_discard(struct loop_device *lo)
 	}
 
 	q->limits.discard_granularity = inode->i_sb->s_blocksize;
-	q->limits.discard_alignment = inode->i_sb->s_blocksize;
+	q->limits.discard_alignment = 0;
 	q->limits.max_discard_sectors = UINT_MAX >> 9;
 	q->limits.discard_zeroes_data = 1;
 	queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);