From: Al Viro <viro@ZenIV.linux.org.uk> To: linux-fsdevel@vger.kernel.org Subject: [PATCH 08/10] 9p: unify paths in v9fs_vfs_lookup() Date: Sat, 26 May 2018 00:54:24 +0100 [thread overview] Message-ID: <20180525235426.9750-8-viro@ZenIV.linux.org.uk> (raw) In-Reply-To: <20180525235426.9750-1-viro@ZenIV.linux.org.uk> From: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- fs/9p/vfs_inode.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 9ee534159cc6..42e102e2e74a 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -823,28 +823,21 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, if (IS_ERR(dfid)) return ERR_CAST(dfid); - name = dentry->d_name.name; - fid = p9_client_walk(dfid, 1, &name, 1); - if (IS_ERR(fid)) { - if (fid == ERR_PTR(-ENOENT)) { - d_add(dentry, NULL); - return NULL; - } - return ERR_CAST(fid); - } /* * Make sure we don't use a wrong inode due to parallel * unlink. For cached mode create calls request for new * inode. But with cache disabled, lookup should do this. */ - if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) + name = dentry->d_name.name; + fid = p9_client_walk(dfid, 1, &name, 1); + if (fid == ERR_PTR(-ENOENT)) + inode = NULL; + else if (IS_ERR(fid)) + inode = ERR_CAST(fid); + else if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) inode = v9fs_get_inode_from_fid(v9ses, fid, dir->i_sb); else inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb); - if (IS_ERR(inode)) { - p9_client_clunk(fid); - return ERR_CAST(inode); - } /* * If we had a rename on the server and a parallel lookup * for the new name, then make sure we instantiate with @@ -853,12 +846,14 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, * k/b. */ res = d_splice_alias(inode, dentry); - if (!res) - v9fs_fid_add(dentry, fid); - else if (!IS_ERR(res)) - v9fs_fid_add(res, fid); - else - p9_client_clunk(fid); + if (!IS_ERR(fid)) { + if (!res) + v9fs_fid_add(dentry, fid); + else if (!IS_ERR(res)) + v9fs_fid_add(res, fid); + else + p9_client_clunk(fid); + } return res; } -- 2.11.0
next prev parent reply other threads:[~2018-05-25 23:54 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 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 ` Al Viro [this message] 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=20180525235426.9750-8-viro@ZenIV.linux.org.uk \ --to=viro@zeniv.linux.org.uk \ --cc=linux-fsdevel@vger.kernel.org \ --subject='Re: [PATCH 08/10] 9p: unify paths in v9fs_vfs_lookup()' \ /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
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).