From 1dd55a67590016b0e92ae2610b1e32e664ff528a Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Fri, 2 Dec 2011 14:47:03 +0100
Subject: [PATCH] --- yaml --- r: 276691 b: refs/heads/master c:
 dfaf3c036cd46a73f4ef3e4b75c1f647e503d4e1 h: refs/heads/master i:   276689:
 abb50aa3e5df484a376f6df845995122a6da4088   276687:
 2e085dd08a58208883be7d509faafc65b7c39262 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/loop.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 30a6b13e8357..072b0e461524 100644
--- 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
index 5579fda279b4..1e888c9e85b3 100644
--- 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);