diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
| commit | 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch) | |
| tree | f139adcc861a05e7cc09cdb387a271a652fc2d07 /fs/nfs/nfs3xdr.c | |
| parent | 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
| download | kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.gz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.xz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 ec233619687..0250269e975 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -22,14 +22,13 @@ #include <linux/nfs3.h> #include <linux/nfs_fs.h> #include <linux/nfsacl.h> +#include "internal.h" #define NFSDBG_FACILITY NFSDBG_XDR /* Mapping from NFS error code to "errno" error code. */ #define errno_NFSERR_IO EIO -extern int nfs_stat_to_errno(int); - /* * Declare the space requirements for NFS arguments and replies as * number of 32bit-words @@ -166,7 +165,8 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr) if (MAJOR(fattr->rdev) != major || MINOR(fattr->rdev) != minor) fattr->rdev = 0; - p = xdr_decode_hyper(p, &fattr->fsid_u.nfs3); + p = xdr_decode_hyper(p, &fattr->fsid.major); + fattr->fsid.minor = 0; p = xdr_decode_hyper(p, &fattr->fileid); p = xdr_decode_time3(p, &fattr->atime); p = xdr_decode_time3(p, &fattr->mtime); |