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/nfs3xdr.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/nfs3xdr.c')
| -rw-r--r-- | fs/nfsd/nfs3xdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index d7647f70e02b..17d0dd997204 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c | |||
| @@ -218,7 +218,7 @@ encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) | |||
| 218 | int err; | 218 | int err; |
| 219 | struct kstat stat; | 219 | struct kstat stat; |
| 220 | 220 | ||
| 221 | err = vfs_getattr(fhp->fh_export->ex_mnt, dentry, &stat); | 221 | err = vfs_getattr(fhp->fh_export->ex_path.mnt, dentry, &stat); |
| 222 | if (!err) { | 222 | if (!err) { |
| 223 | *p++ = xdr_one; /* attributes follow */ | 223 | *p++ = xdr_one; /* attributes follow */ |
| 224 | lease_get_mtime(dentry->d_inode, &stat.mtime); | 224 | lease_get_mtime(dentry->d_inode, &stat.mtime); |
| @@ -270,7 +270,7 @@ void fill_post_wcc(struct svc_fh *fhp) | |||
| 270 | if (fhp->fh_post_saved) | 270 | if (fhp->fh_post_saved) |
| 271 | printk("nfsd: inode locked twice during operation.\n"); | 271 | printk("nfsd: inode locked twice during operation.\n"); |
| 272 | 272 | ||
| 273 | err = vfs_getattr(fhp->fh_export->ex_mnt, fhp->fh_dentry, | 273 | err = vfs_getattr(fhp->fh_export->ex_path.mnt, fhp->fh_dentry, |
| 274 | &fhp->fh_post_attr); | 274 | &fhp->fh_post_attr); |
| 275 | if (err) | 275 | if (err) |
| 276 | fhp->fh_post_saved = 0; | 276 | fhp->fh_post_saved = 0; |