From: Christoph Hellwig <hch@infradead.org>
To: Allison Collins <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v4 05/17] xfs: Add xfs_has_attr and subroutines
Date: Mon, 11 Nov 2019 09:53:46 -0800 [thread overview]
Message-ID: <20191111175346.GC28708@infradead.org> (raw)
In-Reply-To: <20191107012801.22863-6-allison.henderson@oracle.com>
> + if (!xfs_inode_hasattr(dp)) {
> + error = -ENOATTR;
> + } else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
> + ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);
> + error = xfs_attr_shortform_hasname(args, NULL, NULL);
> + } else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
> + error = xfs_attr_leaf_hasname(args, &bp);
> + if (error != -ENOATTR && error != -EEXIST)
> + goto out;
> + xfs_trans_brelse(args->trans, bp);
> + } else {
> + error = xfs_attr_node_hasname(args, NULL);
> + }
> +out:
> + return error;
> +}
I think a lot of this would be much simpler without the goto out, e.g.:
if (!xfs_inode_hasattr(dp))
return -ENOATTR;
if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);
return xfs_attr_shortform_hasname(args, NULL, NULL);
}
if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
struct xfs_buf *bp;
int error = xfs_attr_leaf_hasname(args, &bp);
if (error == -ENOATTR || error == -EEXIST)
xfs_trans_brelse(args->trans, bp);
return error;
}
return xfs_attr_node_hasname(args, NULL);
next prev parent reply other threads:[~2019-11-11 17:53 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 1:27 [PATCH v4 00/17] xfs: Delay Ready Attributes Allison Collins
2019-11-07 1:27 ` [PATCH v4 01/17] xfs: Remove all strlen in all xfs_attr_* functions for attr names Allison Collins
2019-11-11 17:47 ` Christoph Hellwig
2019-11-11 23:35 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 02/17] xfs: Replace attribute parameters with struct xfs_name Allison Collins
2019-11-08 1:13 ` Darrick J. Wong
2019-11-08 17:16 ` Allison Collins
2019-11-11 17:49 ` Christoph Hellwig
2019-11-11 20:07 ` Allison Collins
2019-11-13 15:12 ` Allison Collins
2019-11-20 18:20 ` Christoph Hellwig
2019-11-07 1:27 ` [PATCH v4 03/17] xfs: Embed struct xfs_name in xfs_da_args Allison Collins
2019-11-08 1:25 ` Darrick J. Wong
2019-11-08 16:11 ` Allison Collins
2019-11-08 21:47 ` Darrick J. Wong
2019-11-07 1:27 ` [PATCH v4 04/17] xfs: Add xfs_dabuf defines Allison Collins
2019-11-08 19:19 ` Darrick J. Wong
2019-11-09 17:32 ` Allison Collins
2019-11-09 20:11 ` Darrick J. Wong
2019-11-09 22:06 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 05/17] xfs: Add xfs_has_attr and subroutines Allison Collins
2019-11-08 19:32 ` Darrick J. Wong
2019-11-08 19:51 ` Allison Collins
2019-11-11 17:40 ` Brian Foster
2019-11-11 23:34 ` Allison Collins
2019-11-11 17:53 ` Christoph Hellwig [this message]
2019-11-11 23:36 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 06/17] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2019-11-08 19:34 ` Darrick J. Wong
2019-11-08 19:51 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 07/17] xfs: Factor up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2019-11-08 19:35 ` Darrick J. Wong
2019-11-08 19:52 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 08/17] xfs: Factor out xfs_attr_leaf_addname helper Allison Collins
2019-11-08 20:57 ` Darrick J. Wong
2019-11-09 21:41 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 09/17] xfs: Factor up commit from xfs_attr_try_sf_addname Allison Collins
2019-11-08 21:04 ` Darrick J. Wong
2019-11-08 23:13 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 10/17] xfs: Factor up trans roll from xfs_attr3_leaf_setflag Allison Collins
2019-11-07 1:27 ` [PATCH v4 11/17] xfs: Add xfs_attr3_leaf helper functions Allison Collins
2019-11-08 21:17 ` Darrick J. Wong
2019-11-09 0:09 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 12/17] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2019-11-08 21:19 ` Darrick J. Wong
2019-11-09 0:10 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 13/17] xfs: Factor up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2019-11-08 21:19 ` Darrick J. Wong
2019-11-09 0:11 ` Allison Collins
2019-11-11 18:23 ` Brian Foster
2019-11-11 23:37 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 14/17] xfs: Add delay context to xfs_da_args Allison Collins
2019-11-08 21:22 ` Darrick J. Wong
2019-11-09 0:23 ` Allison Collins
2019-11-11 18:23 ` Brian Foster
2019-11-11 23:42 ` Allison Collins
2019-11-07 1:27 ` [PATCH v4 15/17] xfs: Check for -ENOATTR or -EEXIST Allison Collins
2019-11-08 21:28 ` Darrick J. Wong
2019-11-08 21:42 ` Allison Collins
2019-11-08 21:51 ` Darrick J. Wong
2019-11-11 18:24 ` Brian Foster
2019-11-12 0:33 ` Allison Collins
2019-11-07 1:28 ` [PATCH v4 16/17] xfs: Add delay ready attr remove routines Allison Collins
2019-11-08 21:37 ` Darrick J. Wong
2019-11-09 0:25 ` Allison Collins
2019-11-12 13:37 ` Brian Foster
2019-11-13 0:43 ` Allison Collins
2019-11-13 11:54 ` Brian Foster
2019-11-13 23:39 ` Allison Collins
2019-11-14 12:48 ` Brian Foster
2019-11-14 17:58 ` Allison Collins
2019-11-07 1:28 ` [PATCH v4 17/17] xfs: Add delay ready attr set routines Allison Collins
2019-11-08 21:42 ` Darrick J. Wong
2019-11-08 21:52 ` Allison Collins
2019-11-09 4:07 ` Allison Collins
2019-11-12 13:37 ` Brian Foster
2019-11-13 4:57 ` Allison Collins
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=20191111175346.GC28708@infradead.org \
--to=hch@infradead.org \
--cc=allison.henderson@oracle.com \
--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