Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c587f0c0 authored by Josef Bacik's avatar Josef Bacik Committed by Linus Torvalds
Browse files

ext3: fix wrong gfp type under transaction 



There are several places where we make allocations with GFP_KERNEL while under
a transaction, which could lead to an assertion panic or lockup if under
memory pressure.  This patch switches these problem areas to use GFP_NOFS to
keep these problems from happening.

Signed-off-by: default avatarJosef Bacik <jbacik@redhat.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ffda6857

fs/ext3/acl.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ ext3_acl_from_disk(const void *value, size_t size) 
		return ERR_PTR(-EINVAL);

	if (count == 0)

		return NULL;

	acl = posix_acl_alloc(count, GFP_KERNEL);

	acl = posix_acl_alloc(count, GFP_NOFS);

	if (!acl)

		return ERR_PTR(-ENOMEM);

	for (n=0; n < count; n++) {
@@ -91,7 +91,7 @@ ext3_acl_to_disk(const struct posix_acl *acl, size_t *size) 


	*size = ext3_acl_size(acl->a_count);

	ext_acl = kmalloc(sizeof(ext3_acl_header) + acl->a_count *

			sizeof(ext3_acl_entry), GFP_KERNEL);

			sizeof(ext3_acl_entry), GFP_NOFS);

	if (!ext_acl)

		return ERR_PTR(-ENOMEM);

	ext_acl->a_version = cpu_to_le32(EXT3_ACL_VERSION);
@@ -187,7 +187,7 @@ ext3_get_acl(struct inode *inode, int type) 
	}

	retval = ext3_xattr_get(inode, name_index, "", NULL, 0);

	if (retval > 0) {

		value = kmalloc(retval, GFP_KERNEL);

		value = kmalloc(retval, GFP_NOFS);

		if (!value)

			return ERR_PTR(-ENOMEM);

		retval = ext3_xattr_get(inode, name_index, "", value, retval);
@@ -335,7 +335,7 @@ ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir) 
			if (error)

				goto cleanup;

		}

		clone = posix_acl_clone(acl, GFP_KERNEL);

		clone = posix_acl_clone(acl, GFP_NOFS);

		error = -ENOMEM;

		if (!clone)

			goto cleanup;

fs/ext3/resize.c

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
		goto exit_dindj;



	n_group_desc = kmalloc((gdb_num + 1) * sizeof(struct buffer_head *),

			GFP_KERNEL);

			GFP_NOFS);

	if (!n_group_desc) {

		err = -ENOMEM;

		ext3_warning (sb, __FUNCTION__,
@@ -568,7 +568,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, 
	int res, i;

	int err;



	primary = kmalloc(reserved_gdb * sizeof(*primary), GFP_KERNEL);

	primary = kmalloc(reserved_gdb * sizeof(*primary), GFP_NOFS);

	if (!primary)

		return -ENOMEM;

fs/ext3/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ ext3_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;
@@ -740,7 +740,7 @@ ext3_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)