tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

fs/namei.c: don't pass nameidata to d_revalidate()

since the method wrapped by it doesn't need that anymore...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 4ce16ef3 0b728e19

+6 -6
+6 -6
fs/namei.c
··· 463 463 return -ECHILD; 464 464 } 465 465 466 - static inline int d_revalidate(struct dentry *dentry, struct nameidata *nd) 466 + static inline int d_revalidate(struct dentry *dentry, unsigned int flags) 467 467 { 468 - return dentry->d_op->d_revalidate(dentry, nd ? nd->flags : 0); 468 + return dentry->d_op->d_revalidate(dentry, flags); 469 469 } 470 470 471 471 /** ··· 511 511 return 0; 512 512 513 513 /* Note: we do not d_invalidate() */ 514 - status = d_revalidate(dentry, nd); 514 + status = d_revalidate(dentry, nd->flags); 515 515 if (status > 0) 516 516 return 0; 517 517 ··· 1050 1050 if (d_need_lookup(dentry)) { 1051 1051 *need_lookup = true; 1052 1052 } else if (dentry->d_flags & DCACHE_OP_REVALIDATE) { 1053 - error = d_revalidate(dentry, nd); 1053 + error = d_revalidate(dentry, nd ? nd->flags : 0); 1054 1054 if (unlikely(error <= 0)) { 1055 1055 if (error < 0) { 1056 1056 dput(dentry); ··· 1158 1158 if (unlikely(d_need_lookup(dentry))) 1159 1159 goto unlazy; 1160 1160 if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) { 1161 - status = d_revalidate(dentry, nd); 1161 + status = d_revalidate(dentry, nd->flags); 1162 1162 if (unlikely(status <= 0)) { 1163 1163 if (status != -ECHILD) 1164 1164 need_reval = 0; ··· 1188 1188 } 1189 1189 1190 1190 if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) 1191 - status = d_revalidate(dentry, nd); 1191 + status = d_revalidate(dentry, nd->flags); 1192 1192 if (unlikely(status <= 0)) { 1193 1193 if (status < 0) { 1194 1194 dput(dentry);