Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

[net-next-2.6.git] / fs / nilfs2 / the_nilfs.c

diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index ba7c10c917fcd1545a668c53f6abb2819b04f3bc..d2771510337634803c5e201cddc7a41838847830 100644 (file)
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -775,9 +775,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
                        ret = blkdev_issue_discard(nilfs->ns_bdev,
                                                   start * sects_per_block,
                                                   nblocks * sects_per_block,
-                                                  GFP_NOFS,
-                                                  BLKDEV_IFL_WAIT |
-                                                  BLKDEV_IFL_BARRIER);
+                                                  GFP_NOFS, 0);
                        if (ret < 0)
                                return ret;
                        nblocks = 0;
@@ -787,8 +785,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
                ret = blkdev_issue_discard(nilfs->ns_bdev,
                                           start * sects_per_block,
                                           nblocks * sects_per_block,
-                                          GFP_NOFS,
-                                         BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
+                                          GFP_NOFS, 0);
        return ret;
 }