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);