---

yaml --- r: 213207 b: refs/heads/master c: 61002f7 h: refs/heads/master i: 213205: 10953c9 213203: 180e2f4 213199: 160af5c v: v3
git-mirror · Sep 10, 2010 · 404fdcb · 404fdcb
1 parent c675026
commit 404fdcb
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: 9c35575bbe6b1dd4914a5323c8df8b3159edcc75
+refs/heads/master: 61002f7db33c7d064cddcdab680fb750fa43d8fd
diff --git 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);