diff options
Diffstat (limited to 'fs/nfs/nfs3xdr.c')
-rw-r--r-- | fs/nfs/nfs3xdr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index ec233619687e..0250269e9753 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c | |||
@@ -22,14 +22,13 @@ | |||
22 | #include <linux/nfs3.h> | 22 | #include <linux/nfs3.h> |
23 | #include <linux/nfs_fs.h> | 23 | #include <linux/nfs_fs.h> |
24 | #include <linux/nfsacl.h> | 24 | #include <linux/nfsacl.h> |
25 | #include "internal.h" | ||
25 | 26 | ||
26 | #define NFSDBG_FACILITY NFSDBG_XDR | 27 | #define NFSDBG_FACILITY NFSDBG_XDR |
27 | 28 | ||
28 | /* Mapping from NFS error code to "errno" error code. */ | 29 | /* Mapping from NFS error code to "errno" error code. */ |
29 | #define errno_NFSERR_IO EIO | 30 | #define errno_NFSERR_IO EIO |
30 | 31 | ||
31 | extern int nfs_stat_to_errno(int); | ||
32 | |||
33 | /* | 32 | /* |
34 | * Declare the space requirements for NFS arguments and replies as | 33 | * Declare the space requirements for NFS arguments and replies as |
35 | * number of 32bit-words | 34 | * number of 32bit-words |
@@ -166,7 +165,8 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr) | |||
166 | if (MAJOR(fattr->rdev) != major || MINOR(fattr->rdev) != minor) | 165 | if (MAJOR(fattr->rdev) != major || MINOR(fattr->rdev) != minor) |
167 | fattr->rdev = 0; | 166 | fattr->rdev = 0; |
168 | 167 | ||
169 | p = xdr_decode_hyper(p, &fattr->fsid_u.nfs3); | 168 | p = xdr_decode_hyper(p, &fattr->fsid.major); |
169 | fattr->fsid.minor = 0; | ||
170 | p = xdr_decode_hyper(p, &fattr->fileid); | 170 | p = xdr_decode_hyper(p, &fattr->fileid); |
171 | p = xdr_decode_time3(p, &fattr->atime); | 171 | p = xdr_decode_time3(p, &fattr->atime); |
172 | p = xdr_decode_time3(p, &fattr->mtime); | 172 | p = xdr_decode_time3(p, &fattr->mtime); |