]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags()
authorIra Weiny <ira.weiny@intel.com>
Thu, 30 Apr 2020 14:41:36 +0000 (07:41 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Sat, 30 May 2020 03:13:20 +0000 (20:13 -0700)
commitb5df62843273f914c2ac7be8e33931a414df15d7
treeeead4f613244972462a6115c92dd041e465dc8e1
parentf7bf743714ab3f0a93c2c58e915541db83bebdee
fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags()

The functionality in xfs_diflags_to_linux() and xfs_diflags_to_iflags() are
nearly identical.  The only difference is that *_to_linux() is called after
inode setup and disallows changing the DAX flag.

Combining them can be done with a flag which indicates if this is the initial
setup to allow the DAX flag to be properly set only at init time.

So remove xfs_diflags_to_linux() and call the modified xfs_diflags_to_iflags()
directly.

While we are here simplify xfs_diflags_to_iflags() to take struct xfs_inode and
use xfs_ip2xflags() to ensure future diflags are included correctly.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
fs/xfs/xfs_inode.h
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_iops.c