lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfs_lookup_verify_inode() - nd is *always* non-NULL here

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2012-06-10 15:33:51 -04:00
parent 93420b40bb
commit facc3530fb
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/nfs/dir.c
View File

@@ -1069,19 +1069,16 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)
if (IS_AUTOMOUNT(inode)) if (IS_AUTOMOUNT(inode))
return 0; return 0;
if (nd != NULL) { /* VFS wants an on-the-wire revalidation */
/* VFS wants an on-the-wire revalidation */ if (nd->flags & LOOKUP_REVAL)
if (nd->flags & LOOKUP_REVAL) goto out_force;
goto out_force; /* This is an open(2) */
/* This is an open(2) */ if (nfs_lookup_check_intent(nd->flags, LOOKUP_OPEN) != 0 &&
if (nfs_lookup_check_intent(nd->flags, LOOKUP_OPEN) != 0 && !(server->flags & NFS_MOUNT_NOCTO) &&
!(server->flags & NFS_MOUNT_NOCTO) && (S_ISREG(inode->i_mode) ||
(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)))
S_ISDIR(inode->i_mode))) goto out_force;
goto out_force; return 0;
return 0;
}
return nfs_revalidate_inode(server, inode);
out_force: out_force:
return __nfs_revalidate_inode(server, inode); return __nfs_revalidate_inode(server, inode);
} }