From 3e3e218559b104d92130574af51fd951a4b9be5a Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 21 Oct 2005 03:22:39 -0400 Subject: [PATCH] --- yaml --- r: 10163 b: refs/heads/master c: c4cdd038318863e912e9b992489f61497f98b442 h: refs/heads/master i: 10161: 8054aad8d36e43400b2bdeba7f3f943da05a78f8 10159: dcc831146a31c2640b8f86fecc3b7cea29b83b6d v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/xattr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9b7f015626c0..bdd5ca15fc7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4e3ca1ab1ae9ae86134126dcdc88da1caaa32ca +refs/heads/master: c4cdd038318863e912e9b992489f61497f98b442 diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c index 87ac9dc8b381..72e120798677 100644 --- a/trunk/fs/reiserfs/xattr.c +++ b/trunk/fs/reiserfs/xattr.c @@ -453,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)) {