xfs: Check new inode size is OK before preallocating (07f1a4f5) · Commits · 戴 / test

The new xfsqa test 228 tries to preallocate more space than the filesystem contains. it should fail, but instead triggers an assert about lock flags. The failure is due to the size extension failing in vmtruncate() due to rlimit being set. Check this before we start the preallocation to avoid allocating space that will never be used. Also the path through xfs_vn_allocate already holds the IO lock, so it should not be present in the lock flags when the setattr fails. Hence the assert needs to take this into account. This will prevent other such callers from hitting this incorrect ASSERT. (Fixed a reference to "newsize" to read "new_size". -Alex) Signed-off-by:

Dave Chinner <dchinner@redhat.com> Reviewed-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Alex Elder <aelder@sgi.com>

fs/xfs/linux-2.6/xfs_iops.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -585,11 +585,20 @@ xfs_vn_fallocate(
		bf.l_len = len;

		xfs_ilock(ip, XFS_IOLOCK_EXCL);

		/* check the new inode size is valid before allocating */
		if (!(mode & FALLOC_FL_KEEP_SIZE) &&
		offset + len > i_size_read(inode)) {
		new_size = offset + len;
		error = inode_newsize_ok(inode, new_size);
		if (error)
		goto out_unlock;
		}

		error = -xfs_change_file_space(ip, XFS_IOC_RESVSP, &bf,
		0, XFS_ATTR_NOLOCK);
		if (!error && !(mode & FALLOC_FL_KEEP_SIZE) &&
		offset + len > i_size_read(inode))
		new_size = offset + len;
		if (error)
		goto out_unlock;

		/* Change file size if needed */
		if (new_size) {
		@@ -600,6 +609,7 @@ xfs_vn_fallocate(
		error = -xfs_setattr(ip, &iattr, XFS_ATTR_NOLOCK);
		}

		out_unlock:
		xfs_iunlock(ip, XFS_IOLOCK_EXCL);
		out_error:
		return error;

fs/xfs/xfs_vnodeops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ xfs_setattr(
		if (code) {
		ASSERT(tp == NULL);
		lock_flags &= ~XFS_ILOCK_EXCL;
		ASSERT(lock_flags == XFS_IOLOCK_EXCL);
		ASSERT(lock_flags == XFS_IOLOCK_EXCL \|\| !need_iolock);
		goto error_return;
		}
		tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE);

Admin message