AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 04:20:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

namei.c: fold the check for DCACHE_OP_REVALIDATE into d_revalidate()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-01-09 22:25:28 -05:00
parent 209a7fb210
commit a89f833737
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/namei.c
View File

@ -751,7 +751,10 @@ static int unlazy_walk(struct nameidata *nd, struct dentry *dentry, unsigned seq
static inline int d_revalidate(struct dentry *dentry, unsigned int flags) static inline int d_revalidate(struct dentry *dentry, unsigned int flags)
{ {
return dentry->d_op->d_revalidate(dentry, flags); if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE))
return dentry->d_op->d_revalidate(dentry, flags);
else
return 1;
} }
/** /**
@ -1454,19 +1457,14 @@ static struct dentry *lookup_dcache(const struct qstr *name,
struct dentry *dir, struct dentry *dir,
unsigned int flags) unsigned int flags)
{ {
struct dentry *dentry; struct dentry *dentry = d_lookup(dir, name);
int error;
dentry = d_lookup(dir, name);
if (dentry) { if (dentry) {
if (dentry->d_flags & DCACHE_OP_REVALIDATE) { int error = d_revalidate(dentry, flags);
error = d_revalidate(dentry, flags); if (unlikely(error <= 0)) {
if (unlikely(error <= 0)) { if (!error)
if (!error) d_invalidate(dentry);
d_invalidate(dentry); dput(dentry);
dput(dentry); return ERR_PTR(error);
return ERR_PTR(error);
}
} }
} }
return dentry; return dentry;
@ -1556,8 +1554,7 @@ static int lookup_fast(struct nameidata *nd,
return -ECHILD; return -ECHILD;
*seqp = seq; *seqp = seq;
if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) status = d_revalidate(dentry, nd->flags);
status = d_revalidate(dentry, nd->flags);
if (likely(status > 0)) { if (likely(status > 0)) {
/* /*
* Note: do negative dentry check after revalidation in * Note: do negative dentry check after revalidation in
@ -1579,8 +1576,7 @@ static int lookup_fast(struct nameidata *nd,
dentry = __d_lookup(parent, &nd->last); dentry = __d_lookup(parent, &nd->last);
if (unlikely(!dentry)) if (unlikely(!dentry))
return 0; return 0;
if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) status = d_revalidate(dentry, nd->flags);
status = d_revalidate(dentry, nd->flags);
} }
if (unlikely(status <= 0)) { if (unlikely(status <= 0)) {
if (!status) if (!status)
@ -1619,8 +1615,7 @@ static struct dentry *lookup_slow(const struct qstr *name,
if (IS_ERR(dentry)) if (IS_ERR(dentry))
goto out; goto out;
if (unlikely(!d_in_lookup(dentry))) { if (unlikely(!d_in_lookup(dentry))) {
if ((dentry->d_flags & DCACHE_OP_REVALIDATE) && if (!(flags & LOOKUP_NO_REVAL)) {
!(flags & LOOKUP_NO_REVAL)) {
int error = d_revalidate(dentry, flags); int error = d_revalidate(dentry, flags);
if (unlikely(error <= 0)) { if (unlikely(error <= 0)) {
if (!error) { if (!error) {
@ -3057,9 +3052,6 @@ static int lookup_open(struct nameidata *nd, struct path *path,
if (d_in_lookup(dentry)) if (d_in_lookup(dentry))
break; break;
if (!(dentry->d_flags & DCACHE_OP_REVALIDATE))
break;
error = d_revalidate(dentry, nd->flags); error = d_revalidate(dentry, nd->flags);
if (likely(error > 0)) if (likely(error > 0))
break; break;