xfs: kill xfs_ioctl_setattr behaviour mask (fd179b9c) · Commits · e / devices / android_kernel_teracube_emerald

fs/xfs/xfs_ioctl.c

+65 −103

Original line number	Diff line number	Diff line
		@@ -1098,15 +1098,10 @@ xfs_ioctl_setattr_get_trans(
		return ERR_PTR(error);
		}

		#define FSX_PROJID 1
		#define FSX_EXTSIZE 2
		#define FSX_XFLAGS 4

		STATIC int
		xfs_ioctl_setattr(
		xfs_inode_t *ip,
		struct fsxattr *fa,
		int mask)
		struct fsxattr *fa)
		{
		struct xfs_mount *mp = ip->i_mount;
		struct xfs_trans *tp;
		@@ -1120,7 +1115,7 @@ xfs_ioctl_setattr(
		/*
		* Disallow 32bit project ids when projid32bit feature is not enabled.
		*/
		if ((mask & FSX_PROJID) && (fa->fsx_projid > (__uint16_t)-1) &&
		if (fa->fsx_projid > (__uint16_t)-1 &&
		!xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))
		return -EINVAL;

		@@ -1132,7 +1127,7 @@ xfs_ioctl_setattr(
		* If the IDs do change before we take the ilock, we're covered
		* because the i_*dquot fields will get updated anyway.
		*/
		if (XFS_IS_QUOTA_ON(mp) && (mask & FSX_PROJID)) {
		if (XFS_IS_QUOTA_ON(mp)) {
		code = xfs_qm_vop_dqalloc(ip, ip->i_d.di_uid,
		ip->i_d.di_gid, fa->fsx_projid,
		XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp);
		@@ -1151,73 +1146,54 @@ xfs_ioctl_setattr(
		* Only allow changing of projid from init_user_ns since it is a
		* non user namespace aware identifier.
		*/
		if (mask & FSX_PROJID) {
		if (current_user_ns() != &init_user_ns) {
		code = -EINVAL;
		goto error_return;
		}

		if (XFS_IS_QUOTA_RUNNING(mp) &&
		XFS_IS_PQUOTA_ON(mp) &&
		if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp) &&
		xfs_get_projid(ip) != fa->fsx_projid) {
		ASSERT(tp);
		code = xfs_qm_vop_chown_reserve(tp, ip, udqp, NULL,
		pdqp, capable(CAP_FOWNER) ?
		XFS_QMOPT_FORCE_RES : 0);
		code = xfs_qm_vop_chown_reserve(tp, ip, udqp, NULL, pdqp,
		capable(CAP_FOWNER) ? XFS_QMOPT_FORCE_RES : 0);
		if (code) /* out of quota */
		goto error_return;
		}
		}

		if (mask & FSX_EXTSIZE) {
		/*
		* Can't change extent size if any extents are allocated.
		*/
		/* Can't change extent size if any extents are allocated. */
		code = -EINVAL;
		if (ip->i_d.di_nextents &&
		((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
		fa->fsx_extsize)) {
		code = -EINVAL; /* EFBIG? */
		((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) != fa->fsx_extsize))
		goto error_return;
		}

		/*
		* Extent size must be a multiple of the appropriate block
		* size, if set at all. It must also be smaller than the
		* maximum extent size supported by the filesystem.
		* Extent size must be a multiple of the appropriate block size, if set
		* at all. It must also be smaller than the maximum extent size
		* supported by the filesystem.
		*
		* Also, for non-realtime files, limit the extent size hint to
		* half the size of the AGs in the filesystem so alignment
		* doesn't result in extents larger than an AG.
		* Also, for non-realtime files, limit the extent size hint to half the
		* size of the AGs in the filesystem so alignment doesn't result in
		* extents larger than an AG.
		*/
		if (fa->fsx_extsize != 0) {
		xfs_extlen_t size;
		xfs_fsblock_t extsize_fsb;

		extsize_fsb = XFS_B_TO_FSB(mp, fa->fsx_extsize);
		if (extsize_fsb > MAXEXTLEN) {
		code = -EINVAL;
		if (extsize_fsb > MAXEXTLEN)
		goto error_return;
		}

		if (XFS_IS_REALTIME_INODE(ip) \|\|
		((mask & FSX_XFLAGS) &&
		(fa->fsx_xflags & XFS_XFLAG_REALTIME))) {
		size = mp->m_sb.sb_rextsize <<
		mp->m_sb.sb_blocklog;
		(fa->fsx_xflags & XFS_XFLAG_REALTIME)) {
		size = mp->m_sb.sb_rextsize << mp->m_sb.sb_blocklog;
		} else {
		size = mp->m_sb.sb_blocksize;
		if (extsize_fsb > mp->m_sb.sb_agblocks / 2) {
		code = -EINVAL;
		if (extsize_fsb > mp->m_sb.sb_agblocks / 2)
		goto error_return;
		}
		}

		if (fa->fsx_extsize % size) {
		code = -EINVAL;
		if (fa->fsx_extsize % size)
		goto error_return;
		}
		}
		}


		code = xfs_ioctl_setattr_xflags(tp, ip, fa);
		@@ -1225,23 +1201,18 @@ xfs_ioctl_setattr(
		goto error_return;

		/*
		* Change file ownership. Must be the owner or privileged.
		*/
		if (mask & FSX_PROJID) {
		/*
		* CAP_FSETID overrides the following restrictions:
		* Change file ownership. Must be the owner or privileged. CAP_FSETID
		* overrides the following restrictions:
		*
		* The set-user-ID and set-group-ID bits of a file will be
		* cleared upon successful return from chown()
		* The set-user-ID and set-group-ID bits of a file will be cleared upon
		* successful return from chown()
		*/

		if ((ip->i_d.di_mode & (S_ISUID\|S_ISGID)) &&
		!capable_wrt_inode_uidgid(VFS_I(ip), CAP_FSETID))
		ip->i_d.di_mode &= ~(S_ISUID\|S_ISGID);

		/*
		* Change the ownerships and register quota modifications
		* in the transaction.
		*/
		/* Change the ownerships and register project quota modifications */
		if (xfs_get_projid(ip) != fa->fsx_projid) {
		if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) {
		olddquot = xfs_qm_vop_chown(tp, ip,
		@@ -1251,21 +1222,15 @@ xfs_ioctl_setattr(
		xfs_set_projid(ip, fa->fsx_projid);
		}

		}

		/*
		* Only set the extent size hint if we've already determined that the
		* extent size hint should be set on the inode. If no extent size flags
		* are set on the inode then unconditionally clear the extent size hint.
		*/
		if (mask & FSX_EXTSIZE) {
		int extsize = 0;

		if (ip->i_d.di_flags &
		(XFS_DIFLAG_EXTSIZE \| XFS_DIFLAG_EXTSZINHERIT))
		extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog;
		ip->i_d.di_extsize = extsize;
		}
		if (ip->i_d.di_flags & (XFS_DIFLAG_EXTSIZE \| XFS_DIFLAG_EXTSZINHERIT))
		ip->i_d.di_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog;
		else
		ip->i_d.di_extsize = 0;

		code = xfs_trans_commit(tp, 0);

		@@ -1293,18 +1258,15 @@ xfs_ioc_fssetxattr(
		void __user *arg)
		{
		struct fsxattr fa;
		unsigned int mask;
		int error;

		if (copy_from_user(&fa, arg, sizeof(fa)))
		return -EFAULT;

		mask = FSX_XFLAGS \| FSX_EXTSIZE \| FSX_PROJID;

		error = mnt_want_write_file(filp);
		if (error)
		return error;
		error = xfs_ioctl_setattr(ip, &fa, mask);
		error = xfs_ioctl_setattr(ip, &fa);
		mnt_drop_write_file(filp);
		return error;
		}