Merge branch 'master' into for-2.6.35

[pandora-kernel.git] / fs / nilfs2 / the_nilfs.c

diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index a756168..8c10973 100644 (file)
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -674,7 +674,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
                                                   start * sects_per_block,
                                                   nblocks * sects_per_block,
                                                   GFP_NOFS,
                                                   start * sects_per_block,
                                                   nblocks * sects_per_block,
                                                   GFP_NOFS,

-                                                  DISCARD_FL_BARRIER);
+                                                  BLKDEV_IFL_BARRIER);

                        if (ret < 0)
                                return ret;
                        nblocks = 0;
                        if (ret < 0)
                                return ret;
                        nblocks = 0;


@@ -684,7 +684,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,
                ret = blkdev_issue_discard(nilfs->ns_bdev,
                                           start * sects_per_block,
                                           nblocks * sects_per_block,

-                                          GFP_NOFS, DISCARD_FL_BARRIER);
+                                          GFP_NOFS, BLKDEV_IFL_BARRIER);

        return ret;
 }
 
        return ret;
 }