nfsd4: lookup up callback cred only once

[safe/jmp/linux-2.6] / include / linux / nfsd / state.h

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 8d0b101..8d882a3 100644 (file)
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -97,11 +97,30 @@ struct nfs4_callback {
        /* RPC client info */
        atomic_t                cb_set;     /* successful CB_NULL call */
        struct rpc_clnt *       cb_client;
+       struct rpc_cred *       cb_cred;
+};
+
+/* Maximum number of slots per session. 128 is useful for long haul TCP */
+#define NFSD_MAX_SLOTS_PER_SESSION     128
+/* Maximum number of pages per slot cache entry */
+#define NFSD_PAGES_PER_SLOT    1
+/* Maximum number of operations per session compound */
+#define NFSD_MAX_OPS_PER_COMPOUND      16
+
+struct nfsd4_cache_entry {
+       __be32          ce_status;
+       struct kvec     ce_datav; /* encoded NFSv4.1 data in rq_res.head[0] */
+       struct page     *ce_respages[NFSD_PAGES_PER_SLOT + 1];
+       int             ce_cachethis;
+       short           ce_resused;
+       int             ce_opcnt;
+       int             ce_rpchdrlen;
 };
 
 struct nfsd4_slot {
        bool                            sl_inuse;
        u32                             sl_seqid;
+       struct nfsd4_cache_entry        sl_cache_entry;
 };
 
 struct nfsd4_session {
@@ -116,7 +135,7 @@ struct nfsd4_session {
        u32                     se_fmaxresp_cached;
        u32                     se_fmaxops;
        u32                     se_fnumslots;
-       struct nfsd4_slot       *se_slots;      /* forward channel slots */
+       struct nfsd4_slot       se_slots[];     /* forward channel slots */
 };
 
 static inline void
@@ -173,8 +192,9 @@ struct nfs4_client {
 
        /* for nfs41 */
        struct list_head        cl_sessions;
-       u32                     cl_seqid;       /* seqid for create_session */
+       struct nfsd4_slot       cl_slot;        /* create_session slot */
        u32                     cl_exchange_flags;
+       struct nfs4_sessionid   cl_sessionid;
 };
 
 /* struct nfs4_client_reset
@@ -301,6 +321,7 @@ struct nfs4_stateid {
 };
 
 /* flags for preprocess_seqid_op() */
+#define HAS_SESSION             0x00000001
 #define CONFIRM                 0x00000002
 #define OPEN_STATE              0x00000004
 #define LOCK_STATE              0x00000008
@@ -314,7 +335,9 @@ struct nfs4_stateid {
        ((err) != nfserr_stale_stateid) &&      \
        ((err) != nfserr_bad_stateid))
 
-extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh,
+struct nfsd4_compound_state;
+
+extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
                stateid_t *stateid, int flags, struct file **filp);
 extern void nfs4_lock_state(void);
 extern void nfs4_unlock_state(void);
@@ -330,7 +353,7 @@ extern void nfsd4_init_recdir(char *recdir_name);
 extern int nfsd4_recdir_load(void);
 extern void nfsd4_shutdown_recdir(void);
 extern int nfs4_client_to_reclaim(const char *name);
-extern int nfs4_has_reclaimed_state(const char *name);
+extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);
 extern void nfsd4_recdir_purge_old(void);
 extern int nfsd4_create_clid_dir(struct nfs4_client *clp);
 extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);