renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 16:46:23 +08:00
Code

NFS: Fix nfs_reval_fsid()

Browse Source 
We don't need to revalidate the fsid on the root directory. It suffices to
revalidate it on the current directory.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2007-06-05 13:26:15 -04:00
parent b39e625b6e
commit a0356862bc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfs/dir.c
View File

@ -897,14 +897,13 @@ int nfs_is_exclusive_create(struct inode *dir, struct nameidata *nd)
return (nd->intent.open.flags & O_EXCL) != 0; return (nd->intent.open.flags & O_EXCL) != 0;
} }
static inline int nfs_reval_fsid(struct vfsmount *mnt, struct inode *dir, static inline int nfs_reval_fsid(struct inode *dir, const struct nfs_fattr *fattr)
struct nfs_fh *fh, struct nfs_fattr *fattr)
{ {
struct nfs_server *server = NFS_SERVER(dir); struct nfs_server *server = NFS_SERVER(dir);
if (!nfs_fsid_equal(&server->fsid, &fattr->fsid)) if (!nfs_fsid_equal(&server->fsid, &fattr->fsid))
/* Revalidate fsid on root dir */ /* Revalidate fsid using the parent directory */
return __nfs_revalidate_inode(server, mnt->mnt_root->d_inode); return __nfs_revalidate_inode(server, dir);
return 0; return 0;
} }
@ -946,7 +945,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
res = ERR_PTR(error); res = ERR_PTR(error);
goto out_unlock; goto out_unlock;
} }
error = nfs_reval_fsid(nd->mnt, dir, &fhandle, &fattr); error = nfs_reval_fsid(dir, &fattr);
if (error < 0) { if (error < 0) {
res = ERR_PTR(error); res = ERR_PTR(error);
goto out_unlock; goto out_unlock;

4
fs/nfs/inode.c
View File

@ -961,8 +961,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
goto out_changed; goto out_changed;
server = NFS_SERVER(inode); server = NFS_SERVER(inode);
/* Update the fsid if and only if this is the root directory */ /* Update the fsid? */
if (inode == inode->i_sb->s_root->d_inode if (S_ISDIR(inode->i_mode)
&& !nfs_fsid_equal(&server->fsid, &fattr->fsid)) && !nfs_fsid_equal(&server->fsid, &fattr->fsid))
server->fsid = fattr->fsid; server->fsid = fattr->fsid;