Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[safe/jmp/linux-2.6] / fs / nfs / callback.h

diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 6921d82..07baa82 100644 (file)
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -20,25 +20,36 @@ enum nfs4_callback_procnum {
 enum nfs4_callback_opnum {
        OP_CB_GETATTR = 3,
        OP_CB_RECALL  = 4,
+/* Callback operations new to NFSv4.1 */
+       OP_CB_LAYOUTRECALL  = 5,
+       OP_CB_NOTIFY        = 6,
+       OP_CB_PUSH_DELEG    = 7,
+       OP_CB_RECALL_ANY    = 8,
+       OP_CB_RECALLABLE_OBJ_AVAIL = 9,
+       OP_CB_RECALL_SLOT   = 10,
+       OP_CB_SEQUENCE      = 11,
+       OP_CB_WANTS_CANCELLED = 12,
+       OP_CB_NOTIFY_LOCK   = 13,
+       OP_CB_NOTIFY_DEVICEID = 14,
        OP_CB_ILLEGAL = 10044,
 };
 
 struct cb_compound_hdr_arg {
-       int taglen;
+       unsigned int taglen;
        const char *tag;
-       unsigned int callback_ident;
+       unsigned int minorversion;
        unsigned nops;
 };
 
 struct cb_compound_hdr_res {
-       uint32_t *status;
-       int taglen;
+       __be32 *status;
+       unsigned int taglen;
        const char *tag;
-       uint32_t *nops;
+       __be32 *nops;
 };
 
 struct cb_getattrargs {
-       struct sockaddr_in *addr;
+       struct sockaddr *addr;
        struct nfs_fh fh;
        uint32_t bitmap[2];
 };
@@ -53,24 +64,68 @@ struct cb_getattrres {
 };
 
 struct cb_recallargs {
-       struct sockaddr_in *addr;
+       struct sockaddr *addr;
        struct nfs_fh fh;
        nfs4_stateid stateid;
        uint32_t truncate;
 };
 
+#if defined(CONFIG_NFS_V4_1)
+
+struct referring_call {
+       uint32_t                        rc_sequenceid;
+       uint32_t                        rc_slotid;
+};
+
+struct referring_call_list {
+       struct nfs4_sessionid           rcl_sessionid;
+       uint32_t                        rcl_nrefcalls;
+       struct referring_call           *rcl_refcalls;
+};
+
+struct cb_sequenceargs {
+       struct sockaddr                 *csa_addr;
+       struct nfs4_sessionid           csa_sessionid;
+       uint32_t                        csa_sequenceid;
+       uint32_t                        csa_slotid;
+       uint32_t                        csa_highestslotid;
+       uint32_t                        csa_cachethis;
+       uint32_t                        csa_nrclists;
+       struct referring_call_list      *csa_rclists;
+};
+
+struct cb_sequenceres {
+       __be32                          csr_status;
+       struct nfs4_sessionid           csr_sessionid;
+       uint32_t                        csr_sequenceid;
+       uint32_t                        csr_slotid;
+       uint32_t                        csr_highestslotid;
+       uint32_t                        csr_target_highestslotid;
+};
+
+extern unsigned nfs4_callback_sequence(struct cb_sequenceargs *args,
+                                      struct cb_sequenceres *res);
+
+#endif /* CONFIG_NFS_V4_1 */
+
 extern __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res);
 extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy);
 
 #ifdef CONFIG_NFS_V4
-extern int nfs_callback_up(void);
-extern void nfs_callback_down(void);
-#else
-#define nfs_callback_up()      (0)
-#define nfs_callback_down()    do {} while(0)
-#endif
+extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);
+extern void nfs_callback_down(int minorversion);
+#endif /* CONFIG_NFS_V4 */
+
+/*
+ * nfs41: Callbacks are expected to not cause substantial latency,
+ * so we limit their concurrency to 1 by setting up the maximum number
+ * of slots for the backchannel.
+ */
+#define NFS41_BC_MIN_CALLBACKS 1
+#define NFS41_BC_MAX_CALLBACKS 1
 
 extern unsigned int nfs_callback_set_tcpport;
 extern unsigned short nfs_callback_tcpport;
+extern unsigned short nfs_callback_tcpport6;
 
 #endif /* __LINUX_FS_NFS_CALLBACK_H */