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

Commit 9ef06cec authored Apr 12, 2014 by Lukas Czerner Committed by Theodore Ts'o Apr 12, 2014

ext4: remove unnecessary check for APPEND and IMMUTABLE



All the checks IS_APPEND and IS_IMMUTABLE for the fallocate operation on
the inode are done in vfs. No need to do this again in ext4. Remove it.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

parent 622cad13

fs/ext4/extents.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -5398,12 +5398,6 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len)
	/* Take mutex lock */		/* Take mutex lock */
	mutex_lock(&inode->i_mutex);		mutex_lock(&inode->i_mutex);

	/* It's not possible punch hole on append only file */
	if (IS_APPEND(inode) \|\| IS_IMMUTABLE(inode)) {
	ret = -EPERM;
	goto out_mutex;
	}

	if (IS_SWAPFILE(inode)) {		if (IS_SWAPFILE(inode)) {
	ret = -ETXTBSY;		ret = -ETXTBSY;
	goto out_mutex;		goto out_mutex;

fs/ext4/inode.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3541,11 +3541,7 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)
	}		}

	mutex_lock(&inode->i_mutex);		mutex_lock(&inode->i_mutex);
	/* It's not possible punch hole on append only file */
	if (IS_APPEND(inode) \|\| IS_IMMUTABLE(inode)) {
	ret = -EPERM;
	goto out_mutex;
	}
	if (IS_SWAPFILE(inode)) {		if (IS_SWAPFILE(inode)) {
	ret = -ETXTBSY;		ret = -ETXTBSY;
	goto out_mutex;		goto out_mutex;