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

Merge branch 'nfs-for-2.6.39' into nfs-for-next

Browse Source
This commit is contained in:
Trond Myklebust
2011-03-24 17:03:14 -04:00
parent 8f70e95f9f 35124a0994
commit 0acd220192
21 changed files with 1245 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/getroot.c
View File

@@ -222,6 +222,10 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh,
goto out;
}
if (fattr->valid & NFS_ATTR_FATTR_FSID &&
!nfs_fsid_equal(&server->fsid, &fattr->fsid))
memcpy(&server->fsid, &fattr->fsid, sizeof(server->fsid));
inode = nfs_fhget(sb, mntfh, fattr);
if (IS_ERR(inode)) {
dprintk("nfs_get_root: get root inode failed\n");