mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
fs: rearrange general fastpath check now that O_CREAT uses it
If we find a positive dentry we can now simply try and open it. All prelimiary checks are already done with or without O_CREAT. Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
d459c52ab3
commit
0f93bb54a3
17
fs/namei.c
17
fs/namei.c
@ -3666,26 +3666,17 @@ static const char *open_last_lookups(struct nameidata *nd,
|
||||
if (IS_ERR(dentry))
|
||||
return ERR_CAST(dentry);
|
||||
|
||||
if (!(open_flag & O_CREAT)) {
|
||||
if (likely(dentry))
|
||||
goto finish_lookup;
|
||||
if (likely(dentry))
|
||||
goto finish_lookup;
|
||||
|
||||
if (!(open_flag & O_CREAT)) {
|
||||
if (WARN_ON_ONCE(nd->flags & LOOKUP_RCU))
|
||||
return ERR_PTR(-ECHILD);
|
||||
} else {
|
||||
if (nd->flags & LOOKUP_RCU) {
|
||||
bool unlazied;
|
||||
|
||||
/* can stay in rcuwalk if not auditing */
|
||||
if (dentry)
|
||||
goto finish_lookup;
|
||||
unlazied = dentry ? try_to_unlazy_next(nd, dentry) :
|
||||
try_to_unlazy(nd);
|
||||
if (!unlazied)
|
||||
if (!try_to_unlazy(nd))
|
||||
return ERR_PTR(-ECHILD);
|
||||
}
|
||||
if (dentry)
|
||||
goto finish_lookup;
|
||||
}
|
||||
|
||||
if (open_flag & (O_CREAT | O_TRUNC | O_WRONLY | O_RDWR)) {
|
||||
|
Loading…
Reference in New Issue
Block a user