summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@fys.uio.no>2002-12-15 00:11:18 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-12-15 00:11:18 -0800
commit4de40457252dd617c7c826e1135da30da77e802f (patch)
treea466561964b5e42bf17ff44fa47c8f47adcde6c0 /include/linux
parenta0952771e2b0f9a9a6ed5afb3b137b065bb2f06a (diff)
[PATCH] NFSv4 cleanups
- Move the encoding/decoding of the actual COMPOUND XDR header out of encode_compound()/decode_compound(). - Make each NFSv4 operation 'decode_' routine also take care of decoding its own header, and checking it for correctness. Also allows us to get rid of the 'nfserr' parameter...
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/nfs4.h10
-rw-r--r--include/linux/nfs_xdr.h1
2 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index d320dd969b07..36e71c8ed51e 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -196,6 +196,16 @@ enum open_delegation_type4 {
#define NFS4_MINOR_VERSION 0
#define NFS4_DEBUG 1
+#ifdef __KERNEL__
+
+/* Index of predefined Linux client operations */
+
+enum {
+ NFSPROC4_CLNT_NULL = 0, /* Unused */
+ NFSPROC4_CLNT_COMPOUND, /* Soon to be unused */
+};
+
+#endif
#endif
/*
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 970ffa785f78..af914e160fc6 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -488,7 +488,6 @@ struct nfs4_write {
struct nfs4_op {
u32 opnum;
- u32 nfserr;
union {
struct nfs4_access access;
struct nfs4_close close;