b=23289 disable RS_DEBUG by default

[fs/lustre-release.git] / lustre / include / lustre_net.h

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 1a380dc..a85c8c3 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -316,9 +316,9 @@ struct ptlrpc_cb_id {
         void    *cbid_arg;                      /* additional arg */
 };
 
-/** Maximum number of locks to fit into reply state */ 
+/** Maximum number of locks to fit into reply state */
 #define RS_MAX_LOCKS 8
-#define RS_DEBUG     1
+#define RS_DEBUG     0
 
 /**
  * Structure to define reply state on the server
@@ -506,6 +506,7 @@ struct ptlrpc_request {
                 rq_no_delay:1, rq_net_err:1, rq_wait_ctx:1,
                 rq_early:1, rq_must_unlink:1,
                 rq_fake:1,          /* this fake req */
+                rq_memalloc:1,      /* req originated from "kswapd" */
                 /* server-side flags */
                 rq_packed_final:1,  /* packed final reply */
                 rq_hp:1,            /* high priority RPC */
@@ -557,11 +558,11 @@ struct ptlrpc_request {
         /**
          * security and encryption data
          * @{ */
-        struct ptlrpc_cli_ctx   *rq_cli_ctx;     /* client's half ctx */
-        struct ptlrpc_svc_ctx   *rq_svc_ctx;     /* server's half ctx */
-        cfs_list_t               rq_ctx_chain;   /* link to waited ctx */
+        struct ptlrpc_cli_ctx   *rq_cli_ctx;     /**< client's half ctx */
+        struct ptlrpc_svc_ctx   *rq_svc_ctx;     /**< server's half ctx */
+        cfs_list_t               rq_ctx_chain;   /**< link to waited ctx */
 
-        struct sptlrpc_flavor    rq_flvr;        /* client & server */
+        struct sptlrpc_flavor    rq_flvr;        /**< for client & server */
         enum lustre_sec_part     rq_sp_from;
 
         unsigned long            /* client/server security flags */
@@ -587,8 +588,6 @@ struct ptlrpc_request {
         /* (server side), pointed directly into req buffer */
         struct ptlrpc_user_desc *rq_user_desc;
 
-        /** @} */
-
         /** early replies go to offset 0, regular replies go after that */
         unsigned int             rq_reply_off;
 
@@ -604,6 +603,8 @@ struct ptlrpc_request {
         int                      rq_clrbuf_len;  /* only in priv mode */
         int                      rq_clrdata_len; /* only in priv mode */
 
+        /** @} */
+
         /** Fields that help to see if request and reply were swabbed or not */
         __u32 rq_req_swab_mask;
         __u32 rq_rep_swab_mask;