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

Commit 6bded0f3 authored by Dave Chinner's avatar Dave Chinner Committed by Alex Elder
Browse files

xfs: clean up inconsistent variable naming in xfs_swap_extent 



The swap extent ioctl passes in a target inode and a temporary inode
which are clearly named in the ioctl structure. The code then
assigns temp to target and vice versa, making it extremely difficult
to work out which inode is which later in the code.  Make this
consistent throughout the code.

Also make xfs_swap_extent static as there are no external users of
the function.

Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 3a85cd96

fs/xfs/xfs_dfrag.c

+22 −16
Original line number Diff line number Diff line
@@ -45,15 +45,21 @@ 
#include "xfs_vnodeops.h"

#include "xfs_trace.h"





static int xfs_swap_extents(

	xfs_inode_t	*ip,	/* target inode */

	xfs_inode_t	*tip,	/* tmp inode */

	xfs_swapext_t	*sxp);



/*

 * Syssgi interface for swapext

 * ioctl interface for swapext

 */

int

xfs_swapext(

	xfs_swapext_t	*sxp)

{

	xfs_inode_t     *ip, *tip;

	struct file	*file, *target_file;

	struct file	*file, *tmp_file;

	int		error = 0;



	/* Pull information for the target fd */
@@ -68,46 +74,46 @@ xfs_swapext( 
		goto out_put_file;

	}



	target_file = fget((int)sxp->sx_fdtmp);

	if (!target_file) {

	tmp_file = fget((int)sxp->sx_fdtmp);

	if (!tmp_file) {

		error = XFS_ERROR(EINVAL);

		goto out_put_file;

	}



	if (!(target_file->f_mode & FMODE_WRITE) ||

	    (target_file->f_flags & O_APPEND)) {

	if (!(tmp_file->f_mode & FMODE_WRITE) ||

	    (tmp_file->f_flags & O_APPEND)) {

		error = XFS_ERROR(EBADF);

		goto out_put_target_file;

		goto out_put_tmp_file;

	}



	if (IS_SWAPFILE(file->f_path.dentry->d_inode) ||

	    IS_SWAPFILE(target_file->f_path.dentry->d_inode)) {

	    IS_SWAPFILE(tmp_file->f_path.dentry->d_inode)) {

		error = XFS_ERROR(EINVAL);

		goto out_put_target_file;

		goto out_put_tmp_file;

	}



	ip = XFS_I(file->f_path.dentry->d_inode);

	tip = XFS_I(target_file->f_path.dentry->d_inode);

	tip = XFS_I(tmp_file->f_path.dentry->d_inode);



	if (ip->i_mount != tip->i_mount) {

		error = XFS_ERROR(EINVAL);

		goto out_put_target_file;

		goto out_put_tmp_file;

	}



	if (ip->i_ino == tip->i_ino) {

		error = XFS_ERROR(EINVAL);

		goto out_put_target_file;

		goto out_put_tmp_file;

	}



	if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {

		error = XFS_ERROR(EIO);

		goto out_put_target_file;

		goto out_put_tmp_file;

	}



	error = xfs_swap_extents(ip, tip, sxp);



 out_put_target_file:

	fput(target_file);

 out_put_tmp_file:

	fput(tmp_file);

 out_put_file:

	fput(file);

 out:
@@ -186,7 +192,7 @@ xfs_swap_extents_check_format( 
	return 0;

}



int

static int

xfs_swap_extents(

	xfs_inode_t	*ip,	/* target inode */

	xfs_inode_t	*tip,	/* tmp inode */

fs/xfs/xfs_dfrag.h

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ typedef struct xfs_swapext 
 */

int	xfs_swapext(struct xfs_swapext *sx);



int	xfs_swap_extents(struct xfs_inode *ip, struct xfs_inode *tip,

		struct xfs_swapext *sxp);



#endif	/* __KERNEL__ */



#endif	/* __XFS_DFRAG_H__ */