diff options
author | Josef Bacik | 2008-04-09 15:33:41 +0200 |
---|---|---|
committer | Steven Whitehouse | 2008-04-10 10:55:26 +0200 |
commit | 16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445 (patch) | |
tree | 84204e44e0246e9a3f4db23223a5209105fde368 /fs/gfs2/eattr.c | |
parent | [GFS2] test for IS_ERR rather than 0 (diff) | |
download | kernel-qcow2-linux-16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445.tar.gz kernel-qcow2-linux-16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445.tar.xz kernel-qcow2-linux-16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445.zip |
[GFS2] fix GFP_KERNEL misuses
There are several places where GFP_KERNEL allocations happen under a glock,
which will result in hangs if we're under memory pressure and go to re-enter the
fs in order to flush stuff out. This patch changes the culprits to GFS_NOFS to
keep this problem from happening. Thank you,
Signed-off-by: Josef Bacik <jbacik@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/eattr.c')
-rw-r--r-- | fs/gfs2/eattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c index 81755925a755..e3f76f451b0a 100644 --- a/fs/gfs2/eattr.c +++ b/fs/gfs2/eattr.c @@ -448,7 +448,7 @@ static int ea_get_unstuffed(struct gfs2_inode *ip, struct gfs2_ea_header *ea, unsigned int x; int error = 0; - bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_KERNEL); + bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_NOFS); if (!bh) return -ENOMEM; @@ -1206,7 +1206,7 @@ static int ea_acl_chmod_unstuffed(struct gfs2_inode *ip, unsigned int x; int error; - bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_KERNEL); + bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_NOFS); if (!bh) return -ENOMEM; |