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

Commit d4bb6d06 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: merge xfs_inode_flush into xfs_fs_write_inode 



Splitting the task for a VFS-induced inode flush into two functions doesn't
make any sense, so merge the two functions dealing with it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
parent e1486dea

fs/xfs/linux-2.6/xfs_super.c

+37 −6
Original line number Diff line number Diff line
@@ -990,26 +990,57 @@ xfs_fs_write_inode( 
	int			sync)

{

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_mount	*mp = ip->i_mount;

	int			error = 0;

	int			flags = 0;



	xfs_itrace_entry(ip);



	if (XFS_FORCED_SHUTDOWN(mp))

		return XFS_ERROR(EIO);



	if (sync) {

		error = xfs_wait_on_pages(ip, 0, -1);

		if (error)

			goto out_error;

		flags |= FLUSH_SYNC;

			goto out;

	}



	/*

	 * Bypass inodes which have already been cleaned by

	 * the inode flush clustering code inside xfs_iflush

	 */

	if (xfs_inode_clean(ip))

		goto out;



	/*

	 * We make this non-blocking if the inode is contended, return

	 * EAGAIN to indicate to the caller that they did not succeed.

	 * This prevents the flush path from blocking on inodes inside

	 * another operation right now, they get caught later by xfs_sync.

	 */

	if (sync) {

		xfs_ilock(ip, XFS_ILOCK_SHARED);

		xfs_iflock(ip);



		error = xfs_iflush(ip, XFS_IFLUSH_SYNC);

	} else {

		error = EAGAIN;

		if (!xfs_ilock_nowait(ip, XFS_ILOCK_SHARED))

			goto out;

		if (xfs_ipincount(ip) || !xfs_iflock_nowait(ip))

			goto out_unlock;



		error = xfs_iflush(ip, XFS_IFLUSH_ASYNC_NOBLOCK);

	}

	error = xfs_inode_flush(ip, flags);



out_error:

 out_unlock:

	xfs_iunlock(ip, XFS_ILOCK_SHARED);

 out:

	/*

	 * if we failed to write out the inode then mark

	 * it dirty again so we'll try again later.

	 */

	if (error)

		xfs_mark_inode_dirty_sync(ip);



	return -error;

}

fs/xfs/linux-2.6/xfs_vnode.h

+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ struct attrlist_cursor_kern; 
#define IO_ISDIRECT	0x00004		/* bypass page cache */

#define IO_INVIS	0x00020		/* don't update inode timestamps */



/*

 * Flags for xfs_inode_flush

 */

#define FLUSH_SYNC		1	/* wait for flush to complete	*/



/*

 * Flush/Invalidate options for vop_toss/flush/flushinval_pages.

 */

fs/xfs/xfs_vnodeops.c

+0 −45
Original line number Diff line number Diff line
@@ -2588,51 +2588,6 @@ std_return: 
	goto std_return;

}



int

xfs_inode_flush(

	xfs_inode_t	*ip,

	int		flags)

{

	xfs_mount_t	*mp = ip->i_mount;

	int		error = 0;



	if (XFS_FORCED_SHUTDOWN(mp))

		return XFS_ERROR(EIO);



	/*

	 * Bypass inodes which have already been cleaned by

	 * the inode flush clustering code inside xfs_iflush

	 */

	if (xfs_inode_clean(ip))

		return 0;



	/*

	 * We make this non-blocking if the inode is contended,

	 * return EAGAIN to indicate to the caller that they

	 * did not succeed. This prevents the flush path from

	 * blocking on inodes inside another operation right

	 * now, they get caught later by xfs_sync.

	 */

	if (flags & FLUSH_SYNC) {

		xfs_ilock(ip, XFS_ILOCK_SHARED);

		xfs_iflock(ip);

	} else if (xfs_ilock_nowait(ip, XFS_ILOCK_SHARED)) {

		if (xfs_ipincount(ip) || !xfs_iflock_nowait(ip)) {

			xfs_iunlock(ip, XFS_ILOCK_SHARED);

			return EAGAIN;

		}

	} else {

		return EAGAIN;

	}



	error = xfs_iflush(ip, (flags & FLUSH_SYNC) ? XFS_IFLUSH_SYNC

						    : XFS_IFLUSH_ASYNC_NOBLOCK);

	xfs_iunlock(ip, XFS_ILOCK_SHARED);



	return error;

}





int

xfs_set_dmattrs(

	xfs_inode_t     *ip,

fs/xfs/xfs_vnodeops.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ int xfs_readdir(struct xfs_inode *dp, void *dirent, size_t bufsize, 
int xfs_symlink(struct xfs_inode *dp, struct xfs_name *link_name,

		const char *target_path, mode_t mode, struct xfs_inode **ipp,

		cred_t *credp);

int xfs_inode_flush(struct xfs_inode *ip, int flags);

int xfs_set_dmattrs(struct xfs_inode *ip, u_int evmask, u_int16_t state);

int xfs_reclaim(struct xfs_inode *ip);

int xfs_change_file_space(struct xfs_inode *ip, int cmd,