From 404fdcbaf5ee953be88a111b62194c641c41f0b7 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Wed, 18 Aug 2010 05:29:18 -0400
Subject: [PATCH] --- yaml --- r: 213207 b: refs/heads/master c:
 61002f7db33c7d064cddcdab680fb750fa43d8fd h: refs/heads/master i:   213205:
 10953c9e6d9750a4c0b5438716719f80ab3ba127   213203:
 180e2f402f58b13927e33c65a1d138e9f0765a34   213199:
 160af5cd34a3a825ce1a5990df25d80027527c49 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/mballoc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2bc2bf95ddfe..fa45e0b1d2e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c35575bbe6b1dd4914a5323c8df8b3159edcc75
+refs/heads/master: 61002f7db33c7d064cddcdab680fb750fa43d8fd
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
index df44b345f662..a22bfef3da95 100644
--- a/trunk/fs/ext4/mballoc.c
+++ b/trunk/fs/ext4/mballoc.c
@@ -2567,7 +2567,7 @@ static inline void ext4_issue_discard(struct super_block *sb,
 	trace_ext4_discard_blocks(sb,
 			(unsigned long long) discard_block, count);
 	ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS,
-			       BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
+			       BLKDEV_IFL_WAIT);
 	if (ret == EOPNOTSUPP) {
 		ext4_warning(sb, "discard not supported, disabling");
 		clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD);