diff options
| author | Josef Bacik <jbacik@redhat.com> | 2008-04-30 04:02:02 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-04-30 04:02:02 +0200 |
| commit | 216553c4b7f3e3e2beb4981cddca9b2027523928 (patch) | |
| tree | aefd413c05b078c6e8cf702956c79548943b5023 /fs/ext4/xattr.c | |
| parent | ext4: Fix hang on umount with quotas when journal is aborted (diff) | |
| download | linux-216553c4b7f3e3e2beb4981cddca9b2027523928.tar.xz linux-216553c4b7f3e3e2beb4981cddca9b2027523928.zip | |
ext4: fix wrong gfp type under transaction
This fixes the allocations with GFP_KERNEL while under a transaction problems
in ext4. This patch is the same as its ext3 counterpart, just switches these
to GFP_NOFS.
Signed-off-by: Josef Bacik <jbacik@redhat.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/xattr.c')
| -rw-r--r-- | fs/ext4/xattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index f56598df6880..df4810d5a387 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -739,7 +739,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ce = NULL; } ea_bdebug(bs->bh, "cloning"); - s->base = kmalloc(bs->bh->b_size, GFP_KERNEL); + s->base = kmalloc(bs->bh->b_size, GFP_NOFS); error = -ENOMEM; if (s->base == NULL) goto cleanup; @@ -751,7 +751,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, } } else { /* Allocate a buffer where we construct the new block. */ - s->base = kzalloc(sb->s_blocksize, GFP_KERNEL); + s->base = kzalloc(sb->s_blocksize, GFP_NOFS); /* assert(header == s->base) */ error = -ENOMEM; if (s->base == NULL) |