diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-24 02:18:08 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-26 02:46:08 -0500 |
commit | 3dadecce20603aa380023c65e6f55f108fd5e952 (patch) | |
tree | 9c6b1540787ba3c0c2342447bf1b35836b1e4314 /fs/nfsd/nfs3xdr.c | |
parent | e72837e3e7bae3f182c4ac63c9424e86f1158dd0 (diff) |
switch vfs_getattr() to struct path
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfsd/nfs3xdr.c')
-rw-r--r-- | fs/nfsd/nfs3xdr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 324c0baf7cda..7af9417be88d 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include "xdr3.h" | 11 | #include "xdr3.h" |
12 | #include "auth.h" | 12 | #include "auth.h" |
13 | #include "netns.h" | 13 | #include "netns.h" |
14 | #include "vfs.h" | ||
14 | 15 | ||
15 | #define NFSDDBG_FACILITY NFSDDBG_XDR | 16 | #define NFSDDBG_FACILITY NFSDDBG_XDR |
16 | 17 | ||
@@ -204,10 +205,10 @@ encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) | |||
204 | { | 205 | { |
205 | struct dentry *dentry = fhp->fh_dentry; | 206 | struct dentry *dentry = fhp->fh_dentry; |
206 | if (dentry && dentry->d_inode) { | 207 | if (dentry && dentry->d_inode) { |
207 | int err; | 208 | __be32 err; |
208 | struct kstat stat; | 209 | struct kstat stat; |
209 | 210 | ||
210 | err = vfs_getattr(fhp->fh_export->ex_path.mnt, dentry, &stat); | 211 | err = fh_getattr(fhp, &stat); |
211 | if (!err) { | 212 | if (!err) { |
212 | *p++ = xdr_one; /* attributes follow */ | 213 | *p++ = xdr_one; /* attributes follow */ |
213 | lease_get_mtime(dentry->d_inode, &stat.mtime); | 214 | lease_get_mtime(dentry->d_inode, &stat.mtime); |
@@ -254,13 +255,12 @@ encode_wcc_data(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) | |||
254 | */ | 255 | */ |
255 | void fill_post_wcc(struct svc_fh *fhp) | 256 | void fill_post_wcc(struct svc_fh *fhp) |
256 | { | 257 | { |
257 | int err; | 258 | __be32 err; |
258 | 259 | ||
259 | if (fhp->fh_post_saved) | 260 | if (fhp->fh_post_saved) |
260 | printk("nfsd: inode locked twice during operation.\n"); | 261 | printk("nfsd: inode locked twice during operation.\n"); |
261 | 262 | ||
262 | err = vfs_getattr(fhp->fh_export->ex_path.mnt, fhp->fh_dentry, | 263 | err = fh_getattr(fhp, &fhp->fh_post_attr); |
263 | &fhp->fh_post_attr); | ||
264 | fhp->fh_post_change = fhp->fh_dentry->d_inode->i_version; | 264 | fhp->fh_post_change = fhp->fh_dentry->d_inode->i_version; |
265 | if (err) { | 265 | if (err) { |
266 | fhp->fh_post_saved = 0; | 266 | fhp->fh_post_saved = 0; |