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

Commit 7a9dc797 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

xfs: merge the projid fields in struct xfs_icdinode 



commit de7a866fd41b227b0aa6e9cbeb0dae221c12f542 upstream.

There is no point in splitting the fields like this in an purely
in-memory structure.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f3252e7

fs/xfs/libxfs/xfs_inode_buf.c

+5 −6
Original line number Diff line number Diff line
@@ -213,13 +213,12 @@ xfs_inode_from_disk( 
	to->di_version = from->di_version;

	if (to->di_version == 1) {

		set_nlink(inode, be16_to_cpu(from->di_onlink));

		to->di_projid_lo = 0;

		to->di_projid_hi = 0;

		to->di_projid = 0;

		to->di_version = 2;

	} else {

		set_nlink(inode, be32_to_cpu(from->di_nlink));

		to->di_projid_lo = be16_to_cpu(from->di_projid_lo);

		to->di_projid_hi = be16_to_cpu(from->di_projid_hi);

		to->di_projid = (prid_t)be16_to_cpu(from->di_projid_hi) << 16 |

					be16_to_cpu(from->di_projid_lo);

	}



	to->di_format = from->di_format;
@@ -279,8 +278,8 @@ xfs_inode_to_disk( 
	to->di_format = from->di_format;

	to->di_uid = cpu_to_be32(from->di_uid);

	to->di_gid = cpu_to_be32(from->di_gid);

	to->di_projid_lo = cpu_to_be16(from->di_projid_lo);

	to->di_projid_hi = cpu_to_be16(from->di_projid_hi);

	to->di_projid_lo = cpu_to_be16(from->di_projid & 0xffff);

	to->di_projid_hi = cpu_to_be16(from->di_projid >> 16);



	memset(to->di_pad, 0, sizeof(to->di_pad));

	to->di_atime.t_sec = cpu_to_be32(inode->i_atime.tv_sec);

fs/xfs/libxfs/xfs_inode_buf.h

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ struct xfs_icdinode { 
	uint16_t	di_flushiter;	/* incremented on flush */

	uint32_t	di_uid;		/* owner's user id */

	uint32_t	di_gid;		/* owner's group id */

	uint16_t	di_projid_lo;	/* lower part of owner's project id */

	uint16_t	di_projid_hi;	/* higher part of owner's project id */

	uint32_t	di_projid;	/* owner's project id */

	xfs_fsize_t	di_size;	/* number of bytes in file */

	xfs_rfsblock_t	di_nblocks;	/* # of direct & btree blocks used */

	xfs_extlen_t	di_extsize;	/* basic/minimum extent size for file */

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ xfs_qm_id_for_quotatype( 
	case XFS_DQ_GROUP:

		return ip->i_d.di_gid;

	case XFS_DQ_PROJ:

		return xfs_get_projid(ip);

		return ip->i_d.di_projid;

	}

	ASSERT(0);

	return 0;

fs/xfs/xfs_icache.c

+2 −2
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ xfs_inode_match_id( 
		return 0;



	if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) &&

	    xfs_get_projid(ip) != eofb->eof_prid)

	    ip->i_d.di_projid != eofb->eof_prid)

		return 0;



	return 1;
@@ -1454,7 +1454,7 @@ xfs_inode_match_id_union( 
		return 1;



	if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) &&

	    xfs_get_projid(ip) == eofb->eof_prid)

	    ip->i_d.di_projid == eofb->eof_prid)

		return 1;



	return 0;

fs/xfs/xfs_inode.c

+3 −3
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ xfs_ialloc( 
	ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid());

	ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid());

	inode->i_rdev = rdev;

	xfs_set_projid(ip, prid);

	ip->i_d.di_projid = prid;



	if (pip && XFS_INHERIT_GID(pip)) {

		ip->i_d.di_gid = pip->i_d.di_gid;
@@ -1418,7 +1418,7 @@ xfs_link( 
	 * the tree quota mechanism could be circumvented.

	 */

	if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&

		     (xfs_get_projid(tdp) != xfs_get_projid(sip)))) {

		     tdp->i_d.di_projid != sip->i_d.di_projid)) {

		error = -EXDEV;

		goto error_return;

	}
@@ -3299,7 +3299,7 @@ xfs_rename( 
	 * tree quota mechanism would be circumvented.

	 */

	if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&

		     (xfs_get_projid(target_dp) != xfs_get_projid(src_ip)))) {

		     target_dp->i_d.di_projid != src_ip->i_d.di_projid)) {

		error = -EXDEV;

		goto out_trans_cancel;

	}