aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-02 17:11:54 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:20:11 -0400
commitefbb06b7f98a154ef51ad41674548af5cc1fd005 (patch)
tree7324549bd5138c1a439ebe95d1ca5149b9e4cf79
parent81c768808c78283e1b4ed4cd2cad2571294b2090 (diff)
NFS: Remove the redundant nfs_reval_fsid()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/dir.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 82878a19538d..0cc798b40cd7 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -864,16 +864,6 @@ int nfs_is_exclusive_create(struct inode *dir, struct nameidata *nd)
864 return (nd->intent.open.flags & O_EXCL) != 0; 864 return (nd->intent.open.flags & O_EXCL) != 0;
865} 865}
866 866
867static inline int nfs_reval_fsid(struct inode *dir, const struct nfs_fattr *fattr)
868{
869 struct nfs_server *server = NFS_SERVER(dir);
870
871 if (!nfs_fsid_equal(&server->fsid, &fattr->fsid))
872 /* Revalidate fsid using the parent directory */
873 return __nfs_revalidate_inode(server, dir);
874 return 0;
875}
876
877static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) 867static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
878{ 868{
879 struct dentry *res; 869 struct dentry *res;
@@ -912,11 +902,6 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
912 res = ERR_PTR(error); 902 res = ERR_PTR(error);
913 goto out_unlock; 903 goto out_unlock;
914 } 904 }
915 error = nfs_reval_fsid(dir, &fattr);
916 if (error < 0) {
917 res = ERR_PTR(error);
918 goto out_unlock;
919 }
920 inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr); 905 inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr);
921 res = (struct dentry *)inode; 906 res = (struct dentry *)inode;
922 if (IS_ERR(res)) 907 if (IS_ERR(res))