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

Commit f96291f6 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: disaggregate xfs_ioctl_setattr 



xfs_ioctl_setxflags doesn't need all of the functionailty in
xfs_ioctl_setattr() and now we have separate helper functions that
share the checks and modifications that xfs_ioctl_setxflags
requires. Hence disaggregate it from xfs_ioctl_setattr() to allow
further work to be done on xfs_ioctl_setattr.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 8f3d17ab

fs/xfs/xfs_ioctl.c

+18 −5
Original line number Diff line number Diff line
@@ -1324,13 +1324,13 @@ xfs_ioc_getxflags( 


STATIC int

xfs_ioc_setxflags(

	xfs_inode_t		*ip,

	struct xfs_inode	*ip,

	struct file		*filp,

	void			__user *arg)

{

	struct xfs_trans	*tp;

	struct fsxattr		fa;

	unsigned int		flags;

	unsigned int		mask;

	int			error;



	if (copy_from_user(&flags, arg, sizeof(flags)))
@@ -1341,13 +1341,26 @@ xfs_ioc_setxflags( 
		      FS_SYNC_FL))

		return -EOPNOTSUPP;



	mask = FSX_XFLAGS;

	fa.fsx_xflags = xfs_merge_ioc_xflags(flags, xfs_ip2xflags(ip));



	error = mnt_want_write_file(filp);

	if (error)

		return error;

	error = xfs_ioctl_setattr(ip, &fa, mask);



	tp = xfs_ioctl_setattr_get_trans(ip);

	if (IS_ERR(tp)) {

		error = PTR_ERR(tp);

		goto out_drop_write;

	}



	error = xfs_ioctl_setattr_xflags(tp, ip, &fa);

	if (error) {

		xfs_trans_cancel(tp, 0);

		goto out_drop_write;

	}



	error = xfs_trans_commit(tp, 0);

out_drop_write:

	mnt_drop_write_file(filp);

	return error;

}