git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
nfs
/
nfs3xdr.c
diff --git
a/fs/nfs/nfs3xdr.c
b/fs/nfs/nfs3xdr.c
index
442d8c4
..
8849694
100644
(file)
--- a/
fs/nfs/nfs3xdr.c
+++ b/
fs/nfs/nfs3xdr.c
@@
-23,13
+23,14
@@
#include <linux/nfs_fs.h>
#include <linux/nfsacl.h>
#include <linux/vserver/xid.h>
#include <linux/nfs_fs.h>
#include <linux/nfsacl.h>
#include <linux/vserver/xid.h>
-#include "internal.h"
#define NFSDBG_FACILITY NFSDBG_XDR
/* Mapping from NFS error code to "errno" error code. */
#define errno_NFSERR_IO EIO
#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
/*
* Declare the space requirements for NFS arguments and replies as
* number of 32bit-words
@@
-166,8
+167,7
@@
xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr)
if (MAJOR(fattr->rdev) != major || MINOR(fattr->rdev) != minor)
fattr->rdev = 0;
if (MAJOR(fattr->rdev) != major || MINOR(fattr->rdev) != minor)
fattr->rdev = 0;
- p = xdr_decode_hyper(p, &fattr->fsid.major);
- fattr->fsid.minor = 0;
+ p = xdr_decode_hyper(p, &fattr->fsid_u.nfs3);
p = xdr_decode_hyper(p, &fattr->fileid);
p = xdr_decode_time3(p, &fattr->atime);
p = xdr_decode_time3(p, &fattr->mtime);
p = xdr_decode_hyper(p, &fattr->fileid);
p = xdr_decode_time3(p, &fattr->atime);
p = xdr_decode_time3(p, &fattr->mtime);