Pull mca-check-psp into release branch

[linux-2.6-omap-h63xx.git] / fs / reiserfs / xattr.c

diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index e386d3db30513c90ebf9aac18ad9e6a0f3e8adac..72e120798677a0ff20852c4a528bc8c4c5c9aa12 100644 (file)
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -39,7 +39,6 @@
 #include <linux/xattr.h>
 #include <linux/reiserfs_xattr.h>
 #include <linux/reiserfs_acl.h>
-#include <linux/mbcache.h>
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
 #include <linux/smp_lock.h>
@@ -454,7 +453,7 @@ static struct page *reiserfs_get_page(struct inode *dir, unsigned long n)
        struct page *page;
        /* We can deadlock if we try to free dentries,
           and an unlink/rmdir has just occured - GFP_NOFS avoids this */
-       mapping->flags = (mapping->flags & ~__GFP_BITS_MASK) | GFP_NOFS;
+       mapping_set_gfp_mask(mapping, GFP_NOFS);
        page = read_cache_page(mapping, n,
                               (filler_t *) mapping->a_ops->readpage, NULL);
        if (!IS_ERR(page)) {