From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 20/20] xfs: merge _xfs_dic2xflags into xfs_ip2xflags
Date: Tue, 30 Mar 2021 08:25:38 -0700 [thread overview]
Message-ID: <20210330152538.GP4090233@magnolia> (raw)
In-Reply-To: <20210329053829.1851318-21-hch@lst.de>
On Mon, Mar 29, 2021 at 07:38:29AM +0200, Christoph Hellwig wrote:
> Merge _xfs_dic2xflags into its only caller.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
/me wonders if/how this will clash with Miklos' fileattr series, but eh,
whatever, I don't think it will, and if it does it's easy enough to fix.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_inode.c | 54 +++++++++++++++++++---------------------------
> 1 file changed, 22 insertions(+), 32 deletions(-)
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 3006cfbd072617..9100a9b7aa80cb 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -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,
> --
> 2.30.1
>
next prev parent reply other threads:[~2021-03-30 15:26 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 5:38 xfs inode structure cleanups v4 Christoph Hellwig
2021-03-29 5:38 ` [PATCH 01/20] xfs: split xfs_imap_to_bp Christoph Hellwig
2021-03-29 5:38 ` [PATCH 02/20] xfs: consistently initialize di_flags2 Christoph Hellwig
2021-03-29 5:38 ` [PATCH 03/20] xfs: handle crtime more carefully in xfs_bulkstat_one_int Christoph Hellwig
2021-03-29 5:38 ` [PATCH 04/20] xfs: remove the unused xfs_icdinode_has_bigtime helper Christoph Hellwig
2021-03-29 5:38 ` [PATCH 05/20] xfs: remove the di_dmevmask and di_dmstate fields from struct xfs_icdinode Christoph Hellwig
2021-03-30 15:28 ` Darrick J. Wong
2021-03-30 17:33 ` Christoph Hellwig
2021-03-29 5:38 ` [PATCH 06/20] xfs: don't clear the "dinode core" in xfs_inode_alloc Christoph Hellwig
2021-03-29 5:38 ` [PATCH 07/20] xfs: move the di_projid field to struct xfs_inode Christoph Hellwig
2021-03-30 15:20 ` Darrick J. Wong
2021-03-29 5:38 ` [PATCH 08/20] xfs: move the di_size " Christoph Hellwig
2021-03-29 5:38 ` [PATCH 09/20] xfs: move the di_nblocks " Christoph Hellwig
2021-03-29 5:38 ` [PATCH 10/20] xfs: move the di_extsize " Christoph Hellwig
2021-03-29 5:38 ` [PATCH 11/20] xfs: move the di_cowextsize " Christoph Hellwig
2021-03-29 5:38 ` [PATCH 12/20] xfs: move the di_flushiter " Christoph Hellwig
2021-03-29 5:38 ` [PATCH 13/20] xfs: cleanup xfs_fill_fsxattr Christoph Hellwig
2021-03-29 5:38 ` [PATCH 14/20] xfs: use XFS_B_TO_FSB in xfs_ioctl_setattr Christoph Hellwig
2021-03-30 15:20 ` Darrick J. Wong
2021-03-29 5:38 ` [PATCH 15/20] xfs: use a union for i_cowextsize and i_flushiter Christoph Hellwig
2021-03-30 15:22 ` Darrick J. Wong
2021-03-29 5:38 ` [PATCH 16/20] xfs: move the di_forkoff field to struct xfs_inode Christoph Hellwig
2021-03-29 5:38 ` [PATCH 17/20] xfs: move the di_flags " Christoph Hellwig
2021-03-29 5:38 ` [PATCH 18/20] xfs: move the di_flags2 " Christoph Hellwig
2021-03-29 18:14 ` Darrick J. Wong
2021-03-29 5:38 ` [PATCH 19/20] xfs: move the di_crtime " Christoph Hellwig
2021-03-29 5:38 ` [PATCH 20/20] xfs: merge _xfs_dic2xflags into xfs_ip2xflags Christoph Hellwig
2021-03-30 15:25 ` Darrick J. Wong [this message]
2021-03-30 17:31 ` Christoph Hellwig
2021-03-30 18:06 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210330152538.GP4090233@magnolia \
--to=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).