diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /fs/nfsd/nfsproc.c | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/nfsd/nfsproc.c')
| -rw-r--r-- | fs/nfsd/nfsproc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 977a71f64e19..6cfc96a12483 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c | |||
| @@ -41,7 +41,7 @@ static __be32 | |||
| 41 | nfsd_return_attrs(__be32 err, struct nfsd_attrstat *resp) | 41 | nfsd_return_attrs(__be32 err, struct nfsd_attrstat *resp) |
| 42 | { | 42 | { |
| 43 | if (err) return err; | 43 | if (err) return err; |
| 44 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_mnt, | 44 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_path.mnt, |
| 45 | resp->fh.fh_dentry, | 45 | resp->fh.fh_dentry, |
| 46 | &resp->stat)); | 46 | &resp->stat)); |
| 47 | } | 47 | } |
| @@ -49,7 +49,7 @@ static __be32 | |||
| 49 | nfsd_return_dirop(__be32 err, struct nfsd_diropres *resp) | 49 | nfsd_return_dirop(__be32 err, struct nfsd_diropres *resp) |
| 50 | { | 50 | { |
| 51 | if (err) return err; | 51 | if (err) return err; |
| 52 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_mnt, | 52 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_path.mnt, |
| 53 | resp->fh.fh_dentry, | 53 | resp->fh.fh_dentry, |
| 54 | &resp->stat)); | 54 | &resp->stat)); |
| 55 | } | 55 | } |
| @@ -164,7 +164,7 @@ nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, | |||
| 164 | &resp->count); | 164 | &resp->count); |
| 165 | 165 | ||
| 166 | if (nfserr) return nfserr; | 166 | if (nfserr) return nfserr; |
| 167 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_mnt, | 167 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_path.mnt, |
| 168 | resp->fh.fh_dentry, | 168 | resp->fh.fh_dentry, |
| 169 | &resp->stat)); | 169 | &resp->stat)); |
| 170 | } | 170 | } |