diff options
author | Jan Blunck <jblunck@suse.de> | 2008-02-14 22:38:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:17:08 -0500 |
commit | 5477549161480432d053565d2720f08626baf9e3 (patch) | |
tree | 0993666627a6f53f5c7cc9277a329760ccc1002d /fs/nfsd/nfsproc.c | |
parent | 448678a0f3cdd0157f00e98bd337e32030273637 (diff) |
Use struct path in struct svc_export
I'm embedding struct path into struct svc_export.
[akpm@linux-foundation.org: coding-style fixes]
[ezk@cs.sunysb.edu: NFSD: fix wrong mnt_writer count in rename]
Signed-off-by: Jan Blunck <jblunck@suse.de>
Acked-by: J. Bruce Fields <bfields@citi.umich.edu>
Acked-by: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 | } |