From: Mike Marshall <hubcap@omnibond.com>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH 02/10] orangefs_lookup: simplify
Date: Thu, 31 May 2018 14:23:28 -0400 [thread overview]
Message-ID: <CAOg9mSSyHqHuXiPXhYpLcj9v7fE1zoUqVhugL7zw2N1pNLcoZA@mail.gmail.com> (raw)
In-Reply-To: <20180525235426.9750-2-viro@ZenIV.linux.org.uk>
Thanks for the cleanup. This runs through xfstests with no regressions
on 4.17-rc7.
Please add: Tested-by: Mike Marshall <hubcap@omnibond.com>
-Mike
On Fri, May 25, 2018 at 7:54 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> From: Al Viro <viro@zeniv.linux.org.uk>
>
> d_splice_alias() can handle NULL and ERR_PTR() for inode just fine...
>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
> fs/orangefs/namei.c | 64 +++++++----------------------------------------------
> 1 file changed, 8 insertions(+), 56 deletions(-)
>
> diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
> index 1b5707c44c3f..365cd73d9109 100644
> --- a/fs/orangefs/namei.c
> +++ b/fs/orangefs/namei.c
> @@ -110,7 +110,6 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
> struct orangefs_inode_s *parent = ORANGEFS_I(dir);
> struct orangefs_kernel_op_s *new_op;
> struct inode *inode;
> - struct dentry *res;
> int ret = -EINVAL;
>
> /*
> @@ -158,65 +157,18 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
> new_op->downcall.resp.lookup.refn.fs_id,
> ret);
>
> - if (ret < 0) {
> - if (ret == -ENOENT) {
> - /*
> - * if no inode was found, add a negative dentry to
> - * dcache anyway; if we don't, we don't hold expected
> - * lookup semantics and we most noticeably break
> - * during directory renames.
> - *
> - * however, if the operation failed or exited, do not
> - * add the dentry (e.g. in the case that a touch is
> - * issued on a file that already exists that was
> - * interrupted during this lookup -- no need to add
> - * another negative dentry for an existing file)
> - */
> -
> - gossip_debug(GOSSIP_NAME_DEBUG,
> - "orangefs_lookup: Adding *negative* dentry "
> - "%p for %pd\n",
> - dentry,
> - dentry);
> -
> - d_add(dentry, NULL);
> - res = NULL;
> - goto out;
> - }
> -
> + if (ret >= 0) {
> + orangefs_set_timeout(dentry);
> + inode = orangefs_iget(dir->i_sb, &new_op->downcall.resp.lookup.refn);
> + } else if (ret == -ENOENT) {
> + inode = NULL;
> + } else {
> /* must be a non-recoverable error */
> - res = ERR_PTR(ret);
> - goto out;
> - }
> -
> - orangefs_set_timeout(dentry);
> -
> - inode = orangefs_iget(dir->i_sb, &new_op->downcall.resp.lookup.refn);
> - if (IS_ERR(inode)) {
> - gossip_debug(GOSSIP_NAME_DEBUG,
> - "error %ld from iget\n", PTR_ERR(inode));
> - res = ERR_CAST(inode);
> - goto out;
> + inode = ERR_PTR(ret);
> }
>
> - gossip_debug(GOSSIP_NAME_DEBUG,
> - "%s:%s:%d "
> - "Found good inode [%lu] with count [%d]\n",
> - __FILE__,
> - __func__,
> - __LINE__,
> - inode->i_ino,
> - (int)atomic_read(&inode->i_count));
> -
> - /* update dentry/inode pair into dcache */
> - res = d_splice_alias(inode, dentry);
> -
> - gossip_debug(GOSSIP_NAME_DEBUG,
> - "Lookup success (inode ct = %d)\n",
> - (int)atomic_read(&inode->i_count));
> -out:
> op_release(new_op);
> - return res;
> + return d_splice_alias(inode, dentry);
> }
>
> /* return 0 on success; non-zero otherwise */
> --
> 2.11.0
>
next prev parent reply other threads:[~2018-05-31 18:23 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-13 21:26 [RFC][PATCHES] reducing d_add() use, part 1 Al Viro
2018-05-13 21:30 ` [PATCH 01/15] bfs_lookup(): use d_splice_alias() Al Viro
2018-05-13 21:30 ` [PATCH 02/15] bfs_find_entry: pass name/len as qstr pointer Al Viro
2018-05-13 21:30 ` [PATCH 03/15] bfs_add_entry: " Al Viro
2018-05-13 21:30 ` [PATCH 04/15] cramfs_lookup(): use d_splice_alias() Al Viro
2018-05-13 21:30 ` [PATCH 05/15] freevxfs_lookup(): " Al Viro
2018-05-14 8:41 ` Christoph Hellwig
2018-05-14 15:26 ` Al Viro
2018-05-13 21:30 ` [PATCH 06/15] minix_lookup: " Al Viro
2018-05-13 21:30 ` [PATCH 07/15] qnx4_lookup: " Al Viro
2018-05-14 10:48 ` Anders Larsen
2018-05-13 21:30 ` [PATCH 08/15] sysv_lookup: " Al Viro
2018-05-14 8:41 ` Christoph Hellwig
2018-05-13 21:30 ` [PATCH 09/15] ubifs_lookup: " Al Viro
2018-05-14 6:48 ` Richard Weinberger
2018-05-13 21:30 ` [PATCH 10/15] qnx6_lookup: switch to d_splice_alias() Al Viro
2018-05-13 21:30 ` [PATCH 11/15] romfs_lookup: hash negative lookups, use d_splice_alias() Al Viro
2018-05-13 21:30 ` [PATCH 12/15] adfs_lookup_byname: .. *is* taken care of in fs/namei.c Al Viro
2018-05-13 21:30 ` [PATCH 13/15] adfs_lookup: do not fail with ENOENT on negatives, use d_splice_alias() Al Viro
2018-05-13 21:30 ` [PATCH 14/15] xfs_vn_lookup: simplify a bit Al Viro
2018-05-14 8:41 ` Christoph Hellwig
2018-05-13 21:30 ` [PATCH 15/15] openpromfs: switch to d_splice_alias() Al Viro
2018-05-16 9:45 ` [PATCH 01/15] bfs_lookup(): use d_splice_alias() Tigran Aivazian
2018-05-25 23:53 ` [RFC][PATCHES] reducing d_add() use, part 2 Al Viro
2018-05-25 23:54 ` [PATCH 01/10] openpromfs: switch to d_splice_alias() Al Viro
2018-05-25 23:54 ` [PATCH 02/10] orangefs_lookup: simplify Al Viro
2018-05-31 18:23 ` Mike Marshall [this message]
2018-05-25 23:54 ` [PATCH 03/10] omfs_lookup(): report IO errors, use d_splice_alias() Al Viro
2018-05-25 23:54 ` [PATCH 04/10] hfs: " Al Viro
2018-05-25 23:54 ` [PATCH 05/10] hfs: don't allow mounting over .../rsrc Al Viro
2018-05-25 23:54 ` [PATCH 06/10] hfsplus: switch to d_splice_alias() Al Viro
2018-05-25 23:54 ` [PATCH 07/10] ncp_lookup(): use d_splice_alias() Al Viro
2018-05-25 23:54 ` [PATCH 08/10] 9p: unify paths in v9fs_vfs_lookup() Al Viro
2018-05-25 23:54 ` [PATCH 09/10] cifs_lookup(): cifs_get_inode_...() never returns 0 with *inode left NULL Al Viro
2018-05-25 23:54 ` [PATCH 10/10] cifs_lookup(): switch to d_splice_alias() Al Viro
2018-05-26 0:03 ` [RFC][PATCHES] reducing d_add() use, part 3 (procfs) Al Viro
2018-05-26 0:04 ` [PATCH 1/5] procfs: get rid of ancient BS in pid_revalidate() uses Al Viro
2018-05-26 0:04 ` [PATCH 2/5] proc_lookupfd_common(): don't bother with instantiate unless the file is open Al Viro
2018-05-26 0:04 ` [PATCH 3/5] don't bother with tid_fd_revalidate() in lookups Al Viro
2018-05-26 0:04 ` [PATCH 4/5] procfs: switch instantiate_t to d_splice_alias() Al Viro
2018-05-26 0:04 ` [PATCH 5/5] switch the rest of procfs lookups " Al Viro
2018-05-31 8:28 ` [PATCH 1/5] procfs: get rid of ancient BS in pid_revalidate() uses Alexey Dobriyan
2018-05-26 13:07 ` [RFC][PATCHES] reducing d_add() use, part 3 (procfs) Alexey Dobriyan
2018-05-26 13:56 ` Alexey Dobriyan
2018-05-26 18:20 ` Al Viro
2018-05-26 18:38 ` Matthew Wilcox
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=CAOg9mSSyHqHuXiPXhYpLcj9v7fE1zoUqVhugL7zw2N1pNLcoZA@mail.gmail.com \
--to=hubcap@omnibond.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).