summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@fys.uio.no>2004-02-07 16:56:12 +0100
committerTrond Myklebust <trond.myklebust@fys.uio.no>2004-02-07 16:56:12 +0100
commit88e4b0f2c019ff2f4cee0045812bab0f8146f4ae (patch)
tree71ba4720f79ff0ae2825f5d578e539f1bdd8a686 /include/linux
parentf414757e25c8122dcf6ac1b546f67b6317e161b3 (diff)
NFSv4: Convert SETCLIENTID and SETCLIENTID_CONFIRM to be
standalone operations. Ensure that SETCLIENTID_CONFIRM always returns the lease timeout length.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/nfs4.h2
-rw-r--r--include/linux/nfs_fs.h2
-rw-r--r--include/linux/nfs_xdr.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index d535a46f7d4f..a601ae91de21 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -223,6 +223,8 @@ enum {
NFSPROC4_CLNT_SETATTR,
NFSPROC4_CLNT_FSINFO,
NFSPROC4_CLNT_RENEW,
+ NFSPROC4_CLNT_SETCLIENTID,
+ NFSPROC4_CLNT_SETCLIENTID_CONFIRM,
};
#endif
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 4996221041a4..fcaf3322cadf 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -552,6 +552,8 @@ struct nfs4_state {
/* nfs4proc.c */
+extern int nfs4_proc_setclientid(struct nfs4_client *, u32, unsigned short);
+extern int nfs4_proc_setclientid_confirm(struct nfs4_client *);
extern int nfs4_proc_async_renew(struct nfs4_client *);
extern int nfs4_do_close(struct inode *, struct nfs4_state *);
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 09c2dd2216d0..244a430f83ef 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -555,8 +555,6 @@ struct nfs4_op {
struct nfs4_rename rename;
struct nfs4_client * renew;
struct nfs4_setattr setattr;
- struct nfs4_setclientid setclientid;
- struct nfs4_client * setclientid_confirm;
} u;
};