namei: simplify invalidation logics in lookup_dcache()

Al Viro · Al Viro · commit 74ff0ffc7f06 · 2016-03-14T00:15:31.000-04:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/namei.c b/fs/namei.c
@@ -1458,14 +1458,10 @@ static struct dentry *lookup_dcache(struct qstr *name, struct dentry *dir,
 		if (dentry->d_flags & DCACHE_OP_REVALIDATE) {
 			error = d_revalidate(dentry, flags);
 			if (unlikely(error <= 0)) {
-				if (error < 0) {
-					dput(dentry);
-					return ERR_PTR(error);
-				} else {
+				if (!error)
 					d_invalidate(dentry);
-					dput(dentry);
-					dentry = NULL;
-				}
+				dput(dentry);
+				return ERR_PTR(error);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1458,14 +1458,10 @@ static struct dentry lookup_dcache(struct qstr name, struct dentry *dir,`
`1458`	`1458`	`if (dentry->d_flags & DCACHE_OP_REVALIDATE) {`
`1459`	`1459`	`error = d_revalidate(dentry, flags);`
`1460`	`1460`	`if (unlikely(error <= 0)) {`
`1461`		`- if (error < 0) {`
`1462`		`- dput(dentry);`
`1463`		`- return ERR_PTR(error);`
`1464`		`- } else {`
	`1461`	`+ if (!error)`
`1465`	`1462`	`d_invalidate(dentry);`
`1466`		`- dput(dentry);`
`1467`		`- dentry = NULL;`
`1468`		`- }`
	`1463`	`+ dput(dentry);`
	`1464`	`+ return ERR_PTR(error);`
`1469`	`1465`	`}`
`1470`	`1466`	`}`
`1471`	`1467`	`}`