diff options
| author | J. Bruce Fields | 2010-03-09 23:22:08 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2010-03-09 23:22:08 +0100 |
| commit | e739cf1da48e841bc5d744a99764c1a668b4bdd2 (patch) | |
| tree | 1d39318bbbcdd66ad8cd34823ad9befb7af08b1f /fs/nfsd/nfs4xdr.c | |
| parent | nfsd4: document lease/grace-period limits (diff) | |
| parent | Linux 2.6.34-rc1 (diff) | |
| download | kernel-qcow2-linux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.tar.gz kernel-qcow2-linux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.tar.xz kernel-qcow2-linux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.zip | |
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index f61bd736152b..fb27b1db007b 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2121,9 +2121,15 @@ out_acl: * and this is the root of a cross-mounted filesystem. */ if (ignore_crossmnt == 0 && - exp->ex_path.mnt->mnt_root->d_inode == dentry->d_inode) { - err = vfs_getattr(exp->ex_path.mnt->mnt_parent, - exp->ex_path.mnt->mnt_mountpoint, &stat); + dentry == exp->ex_path.mnt->mnt_root) { + struct path path = exp->ex_path; + path_get(&path); + while (follow_up(&path)) { + if (path.dentry != path.mnt->mnt_root) + break; + } + err = vfs_getattr(path.mnt, path.dentry, &stat); + path_put(&path); if (err) goto out_nfserr; } |