Merge branch 'master' into tk71

[mv-sheeva.git] / fs / fat / fatent.c

diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index 81184d3b75a3a50e5917c64f0bc4a5faac64cebd..b47d2c9f4fa100ebfb32c34f9d6d9e269bfa6b0e 100644 (file)
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -577,7 +577,8 @@ int fat_free_clusters(struct inode *inode, int cluster)
 
                                sb_issue_discard(sb,
                                        fat_clus_to_blknr(sbi, first_cl),
-                                       nr_clus * sbi->sec_per_clus);
+                                       nr_clus * sbi->sec_per_clus,
+                                       GFP_NOFS, 0);
 
                                first_cl = cluster;
                        }