[37/37] Reiserfs: Fix up for mapping_set_gfp_mask

From: clameter
Date: Wed Jun 20 2007 - 14:39:11 EST


mapping_set_gfp_mask only works on order 0 page cache operations. Reiserfs
can use 8k pages (order 1). Replace the mapping_set_gfp_mask with
mapping_setup to make this work properly.

Signed-off-by: Christoph Lameter <clameter@xxxxxxx>

---
fs/reiserfs/xattr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.22-rc4-mm2/fs/reiserfs/xattr.c
===================================================================
--- linux-2.6.22-rc4-mm2.orig/fs/reiserfs/xattr.c 2007-06-19 23:54:38.000000000 -0700
+++ linux-2.6.22-rc4-mm2/fs/reiserfs/xattr.c 2007-06-19 23:56:40.000000000 -0700
@@ -405,9 +405,10 @@ static struct page *reiserfs_get_page(st
{
struct address_space *mapping = dir->i_mapping;
struct page *page;
+
/* We can deadlock if we try to free dentries,
and an unlink/rmdir has just occured - GFP_NOFS avoids this */
- mapping_set_gfp_mask(mapping, GFP_NOFS);
+ mapping_setup(mapping, GFP_NOFS, page_cache_shift(mapping));
page = read_mapping_page(mapping, n, NULL);
if (!IS_ERR(page)) {
kmap(page);

--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/