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

Commit 4c5cfd1b authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: factor post-write newsize updates 



Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarAlex Elder <aelder@sgi.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent edafb6da

fs/xfs/linux-2.6/xfs_file.c

+21 −22
Original line number Original line Diff line number Diff line
@@ -345,6 +345,25 @@ xfs_aio_write_isize_update( 
	}

	}

}

}





/*

 * If this was a direct or synchronous I/O that failed (such as ENOSPC) then

 * part of the I/O may have been written to disk before the error occured.  In

 * this case the on-disk file size may have been adjusted beyond the in-memory

 * file size and now needs to be truncated back.

 */

STATIC void

xfs_aio_write_newsize_update(

	struct xfs_inode	*ip)

{

	if (ip->i_new_size) {

		xfs_ilock(ip, XFS_ILOCK_EXCL);

		ip->i_new_size = 0;

		if (ip->i_d.di_size > ip->i_size)

			ip->i_d.di_size = ip->i_size;

		xfs_iunlock(ip, XFS_ILOCK_EXCL);

	}

}



STATIC ssize_t

STATIC ssize_t

xfs_file_splice_write(

xfs_file_splice_write(

	struct pipe_inode_info	*pipe,

	struct pipe_inode_info	*pipe,
@@ -381,14 +400,7 @@ xfs_file_splice_write( 
	ret = generic_file_splice_write(pipe, outfilp, ppos, count, flags);

	ret = generic_file_splice_write(pipe, outfilp, ppos, count, flags);





	xfs_aio_write_isize_update(inode, ppos, ret);

	xfs_aio_write_isize_update(inode, ppos, ret);



	xfs_aio_write_newsize_update(ip);

	if (ip->i_new_size) {

		xfs_ilock(ip, XFS_ILOCK_EXCL);

		ip->i_new_size = 0;

		if (ip->i_d.di_size > ip->i_size)

			ip->i_d.di_size = ip->i_size;

		xfs_iunlock(ip, XFS_ILOCK_EXCL);

	}

	xfs_iunlock(ip, XFS_IOLOCK_EXCL);

	xfs_iunlock(ip, XFS_IOLOCK_EXCL);

	return ret;

	return ret;

}

}
@@ -781,20 +793,7 @@ xfs_file_aio_write( 
	}

	}





 out_unlock_internal:

 out_unlock_internal:

	if (ip->i_new_size) {

	xfs_aio_write_newsize_update(ip);

		xfs_ilock(ip, XFS_ILOCK_EXCL);

		ip->i_new_size = 0;

		/*

		 * If this was a direct or synchronous I/O that failed (such

		 * as ENOSPC) then part of the I/O may have been written to

		 * disk before the error occured.  In this case the on-disk

		 * file size may have been adjusted beyond the in-memory file

		 * size and now needs to be truncated back.

		 */

		if (ip->i_d.di_size > ip->i_size)

			ip->i_d.di_size = ip->i_size;

		xfs_iunlock(ip, XFS_ILOCK_EXCL);

	}

	xfs_iunlock(ip, iolock);

	xfs_iunlock(ip, iolock);

 out_unlock_mutex:

 out_unlock_mutex:

	if (need_i_mutex)

	if (need_i_mutex)