These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lnet / selftest / conrpc.h

diff --git a/kernel/drivers/staging/lustre/lnet/selftest/conrpc.h b/kernel/drivers/staging/lustre/lnet/selftest/conrpc.h
index 2353889..95c832f 100644 (file)
--- a/kernel/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/kernel/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -64,31 +64,29 @@ struct lstcon_test;
 struct lstcon_node;
 
 typedef struct lstcon_rpc {
-       struct list_head               crp_link;       /* chain on rpc transaction */
+       struct list_head        crp_link;       /* chain on rpc transaction */
        srpc_client_rpc_t       *crp_rpc;       /* client rpc */
-       struct lstcon_node      *crp_node;       /* destination node */
+       struct lstcon_node      *crp_node;      /* destination node */
        struct lstcon_rpc_trans *crp_trans;     /* conrpc transaction */
 
-       unsigned int             crp_posted:1;   /* rpc is posted */
-       unsigned int             crp_finished:1; /* rpc is finished */
-       unsigned int             crp_unpacked:1; /* reply is unpacked */
+       unsigned int            crp_posted:1;   /* rpc is posted */
+       unsigned int            crp_finished:1; /* rpc is finished */
+       unsigned int            crp_unpacked:1; /* reply is unpacked */
        /** RPC is embedded in other structure and can't free it */
-       unsigned int             crp_embedded:1;
-       int                   crp_status;     /* console rpc errors */
-       unsigned long          crp_stamp;      /* replied time stamp */
+       unsigned int            crp_embedded:1;
+       int                     crp_status;     /* console rpc errors */
+       unsigned long           crp_stamp;      /* replied time stamp */
 } lstcon_rpc_t;
 
 typedef struct lstcon_rpc_trans {
-       struct list_head            tas_olink;     /* link chain on owner list */
-       struct list_head            tas_link;      /* link chain on global list */
-       int                tas_opc;       /* operation code of transaction */
-       /* features mask is uptodate */
-       unsigned              tas_feats_updated;
-       /* test features mask */
-       unsigned              tas_features;
-       wait_queue_head_t          tas_waitq;     /* wait queue head */
-       atomic_t          tas_remaining; /* # of un-scheduled rpcs */
-       struct list_head            tas_rpcs_list; /* queued requests */
+       struct list_head  tas_olink;         /* link chain on owner list */
+       struct list_head  tas_link;          /* link chain on global list */
+       int               tas_opc;           /* operation code of transaction */
+       unsigned          tas_feats_updated; /* features mask is uptodate */
+       unsigned          tas_features;      /* test features mask */
+       wait_queue_head_t tas_waitq;         /* wait queue head */
+       atomic_t          tas_remaining;     /* # of un-scheduled rpcs */
+       struct list_head  tas_rpcs_list;     /* queued requests */
 } lstcon_rpc_trans_t;
 
 #define LST_TRANS_PRIVATE       0x1000
@@ -107,8 +105,8 @@ typedef struct lstcon_rpc_trans {
 
 #define LST_TRANS_STATQRY       0x21
 
-typedef int (* lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
-typedef int (* lstcon_rpc_readent_func_t)(int, srpc_msg_t *, lstcon_rpc_ent_t *);
+typedef int (*lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
+typedef int (*lstcon_rpc_readent_func_t)(int, srpc_msg_t *, lstcon_rpc_ent_t *);
 
 int  lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
                        unsigned version, lstcon_rpc_t **crpc);
@@ -142,5 +140,4 @@ void lstcon_rpc_cleanup_wait(void);
 int  lstcon_rpc_module_init(void);
 void lstcon_rpc_module_fini(void);
 
-
 #endif