Commit 4422501d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: merge _xfs_dic2xflags into xfs_ip2xflags 



Merge _xfs_dic2xflags into its only caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent e98d5e88

fs/xfs/xfs_inode.c

+22 −32
Original line number Diff line number Diff line
@@ -598,65 +598,55 @@ xfs_lock_two_inodes( 
	}

}



STATIC uint

_xfs_dic2xflags(

	uint16_t		di_flags,

	uint64_t		di_flags2,

	bool			has_attr)

uint

xfs_ip2xflags(

	struct xfs_inode	*ip)

{

	uint			flags = 0;



	if (di_flags & XFS_DIFLAG_ANY) {

		if (di_flags & XFS_DIFLAG_REALTIME)

	if (ip->i_diflags & XFS_DIFLAG_ANY) {

		if (ip->i_diflags & XFS_DIFLAG_REALTIME)

			flags |= FS_XFLAG_REALTIME;

		if (di_flags & XFS_DIFLAG_PREALLOC)

		if (ip->i_diflags & XFS_DIFLAG_PREALLOC)

			flags |= FS_XFLAG_PREALLOC;

		if (di_flags & XFS_DIFLAG_IMMUTABLE)

		if (ip->i_diflags & XFS_DIFLAG_IMMUTABLE)

			flags |= FS_XFLAG_IMMUTABLE;

		if (di_flags & XFS_DIFLAG_APPEND)

		if (ip->i_diflags & XFS_DIFLAG_APPEND)

			flags |= FS_XFLAG_APPEND;

		if (di_flags & XFS_DIFLAG_SYNC)

		if (ip->i_diflags & XFS_DIFLAG_SYNC)

			flags |= FS_XFLAG_SYNC;

		if (di_flags & XFS_DIFLAG_NOATIME)

		if (ip->i_diflags & XFS_DIFLAG_NOATIME)

			flags |= FS_XFLAG_NOATIME;

		if (di_flags & XFS_DIFLAG_NODUMP)

		if (ip->i_diflags & XFS_DIFLAG_NODUMP)

			flags |= FS_XFLAG_NODUMP;

		if (di_flags & XFS_DIFLAG_RTINHERIT)

		if (ip->i_diflags & XFS_DIFLAG_RTINHERIT)

			flags |= FS_XFLAG_RTINHERIT;

		if (di_flags & XFS_DIFLAG_PROJINHERIT)

		if (ip->i_diflags & XFS_DIFLAG_PROJINHERIT)

			flags |= FS_XFLAG_PROJINHERIT;

		if (di_flags & XFS_DIFLAG_NOSYMLINKS)

		if (ip->i_diflags & XFS_DIFLAG_NOSYMLINKS)

			flags |= FS_XFLAG_NOSYMLINKS;

		if (di_flags & XFS_DIFLAG_EXTSIZE)

		if (ip->i_diflags & XFS_DIFLAG_EXTSIZE)

			flags |= FS_XFLAG_EXTSIZE;

		if (di_flags & XFS_DIFLAG_EXTSZINHERIT)

		if (ip->i_diflags & XFS_DIFLAG_EXTSZINHERIT)

			flags |= FS_XFLAG_EXTSZINHERIT;

		if (di_flags & XFS_DIFLAG_NODEFRAG)

		if (ip->i_diflags & XFS_DIFLAG_NODEFRAG)

			flags |= FS_XFLAG_NODEFRAG;

		if (di_flags & XFS_DIFLAG_FILESTREAM)

		if (ip->i_diflags & XFS_DIFLAG_FILESTREAM)

			flags |= FS_XFLAG_FILESTREAM;

	}



	if (di_flags2 & XFS_DIFLAG2_ANY) {

		if (di_flags2 & XFS_DIFLAG2_DAX)

	if (ip->i_diflags2 & XFS_DIFLAG2_ANY) {

		if (ip->i_diflags2 & XFS_DIFLAG2_DAX)

			flags |= FS_XFLAG_DAX;

		if (di_flags2 & XFS_DIFLAG2_COWEXTSIZE)

		if (ip->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE)

			flags |= FS_XFLAG_COWEXTSIZE;

	}



	if (has_attr)

	if (XFS_IFORK_Q(ip))

		flags |= FS_XFLAG_HASATTR;



	return flags;

}



uint

xfs_ip2xflags(

	struct xfs_inode	*ip)

{

	return _xfs_dic2xflags(ip->i_diflags, ip->i_diflags2, XFS_IFORK_Q(ip));

}



/*

 * Lookups up an inode from "name". If ci_name is not NULL, then a CI match

 * is allowed, otherwise it has to be an exact match. If a CI match is found,