evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

in do_lookup() split RCU and non-RCU cases of need_revalidate

Browse source 
and use unlikely() instead of gotos, for fsck sake...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-02-15 01:26:22 -05:00
parent 844a391799
commit 24643087e7
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/namei.c
View file

@ -1259,9 +1259,15 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
return -ECHILD; return -ECHILD;
nd->seq = seq; nd->seq = seq;
if (dentry->d_flags & DCACHE_OP_REVALIDATE) if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) {
goto need_revalidate; dentry = do_revalidate(dentry, nd);
done2: if (!dentry)
goto need_lookup;
if (IS_ERR(dentry))
goto fail;
if (!(nd->flags & LOOKUP_RCU))
goto done;
}
path->mnt = mnt; path->mnt = mnt;
path->dentry = dentry; path->dentry = dentry;
if (likely(__follow_mount_rcu(nd, path, inode, false))) if (likely(__follow_mount_rcu(nd, path, inode, false)))
@ -1274,8 +1280,13 @@ done2:
if (!dentry) if (!dentry)
goto need_lookup; goto need_lookup;
found: found:
if (dentry->d_flags & DCACHE_OP_REVALIDATE) if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) {
goto need_revalidate; dentry = do_revalidate(dentry, nd);
if (!dentry)
goto need_lookup;
if (IS_ERR(dentry))
goto fail;
}
done: done:
path->mnt = mnt; path->mnt = mnt;
path->dentry = dentry; path->dentry = dentry;
@ -1317,16 +1328,6 @@ need_lookup:
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
goto found; goto found;
need_revalidate:
dentry = do_revalidate(dentry, nd);
if (!dentry)
goto need_lookup;
if (IS_ERR(dentry))
goto fail;
if (nd->flags & LOOKUP_RCU)
goto done2;
goto done;
fail: fail:
return PTR_ERR(dentry); return PTR_ERR(dentry);
} }