Skip to content

Commit b794d79

Browse files
jamesasimmonsgregkh
authored andcommitted
staging: lustre: filter remaining extra spacing for lnet selftest
This patch is a result of a filter applied to the lnet selftest code to remove the last bits of hidden white spaces. Signed-off-by: James Simmons <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ec436b9 commit b794d79

File tree

13 files changed

+370
-370
lines changed

13 files changed

+370
-370
lines changed

drivers/staging/lustre/lnet/selftest/brw_test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ brw_client_init(sfw_test_instance_t *tsi)
131131
return 0;
132132
}
133133

134-
#define BRW_POISON 0xbeefbeefbeefbeefULL
135-
#define BRW_MAGIC 0xeeb0eeb1eeb2eeb3ULL
136-
#define BRW_MSIZE sizeof(__u64)
134+
#define BRW_POISON 0xbeefbeefbeefbeefULL
135+
#define BRW_MAGIC 0xeeb0eeb1eeb2eeb3ULL
136+
#define BRW_MSIZE sizeof(__u64)
137137

138138
static int
139139
brw_inject_one_error(void)

drivers/staging/lustre/lnet/selftest/conctl.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ lst_session_info_ioctl(lstio_session_info_args_t *args)
100100
!args->lstio_ses_featp || /* address for output features */
101101
!args->lstio_ses_ndinfo || /* address for output ndinfo */
102102
!args->lstio_ses_namep || /* address for output name */
103-
args->lstio_ses_nmlen <= 0 ||
103+
args->lstio_ses_nmlen <= 0 ||
104104
args->lstio_ses_nmlen > LST_NAME_SIZE)
105105
return -EINVAL;
106106

@@ -297,7 +297,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args)
297297
break;
298298

299299
case LST_GROUP_RMND:
300-
if (args->lstio_grp_count <= 0 ||
300+
if (args->lstio_grp_count <= 0 ||
301301
!args->lstio_grp_idsp) {
302302
rc = -EINVAL;
303303
break;
@@ -368,7 +368,7 @@ lst_group_list_ioctl(lstio_group_list_args_t *args)
368368
if (args->lstio_grp_key != console_session.ses_key)
369369
return -EACCES;
370370

371-
if (args->lstio_grp_idx < 0 ||
371+
if (args->lstio_grp_idx < 0 ||
372372
!args->lstio_grp_namep ||
373373
args->lstio_grp_nmlen <= 0 ||
374374
args->lstio_grp_nmlen > LST_NAME_SIZE)
@@ -591,7 +591,7 @@ lst_batch_list_ioctl(lstio_batch_list_args_t *args)
591591
if (args->lstio_bat_key != console_session.ses_key)
592592
return -EACCES;
593593

594-
if (args->lstio_bat_idx < 0 ||
594+
if (args->lstio_bat_idx < 0 ||
595595
!args->lstio_bat_namep ||
596596
args->lstio_bat_nmlen <= 0 ||
597597
args->lstio_bat_nmlen > LST_NAME_SIZE)
@@ -755,7 +755,7 @@ static int lst_test_add_ioctl(lstio_test_args_t *args)
755755
goto out;
756756

757757
LIBCFS_ALLOC(dst_name, args->lstio_tes_dgrp_nmlen + 1);
758-
if (!dst_name)
758+
if (!dst_name)
759759
goto out;
760760

761761
if (args->lstio_tes_param) {

drivers/staging/lustre/lnet/selftest/conrpc.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -51,59 +51,59 @@
5151
#include "selftest.h"
5252

5353
/* Console rpc and rpc transaction */
54-
#define LST_TRANS_TIMEOUT 30
55-
#define LST_TRANS_MIN_TIMEOUT 3
54+
#define LST_TRANS_TIMEOUT 30
55+
#define LST_TRANS_MIN_TIMEOUT 3
5656

5757
#define LST_VALIDATE_TIMEOUT(t) min(max(t, LST_TRANS_MIN_TIMEOUT), LST_TRANS_TIMEOUT)
5858

59-
#define LST_PING_INTERVAL 8
59+
#define LST_PING_INTERVAL 8
6060

6161
struct lstcon_rpc_trans;
6262
struct lstcon_tsb_hdr;
6363
struct lstcon_test;
6464
struct lstcon_node;
6565

6666
typedef struct lstcon_rpc {
67-
struct list_head crp_link; /* chain on rpc transaction */
68-
srpc_client_rpc_t *crp_rpc; /* client rpc */
69-
struct lstcon_node *crp_node; /* destination node */
70-
struct lstcon_rpc_trans *crp_trans; /* conrpc transaction */
71-
72-
unsigned int crp_posted:1; /* rpc is posted */
73-
unsigned int crp_finished:1; /* rpc is finished */
74-
unsigned int crp_unpacked:1; /* reply is unpacked */
67+
struct list_head crp_link; /* chain on rpc transaction */
68+
srpc_client_rpc_t *crp_rpc; /* client rpc */
69+
struct lstcon_node *crp_node; /* destination node */
70+
struct lstcon_rpc_trans *crp_trans; /* conrpc transaction */
71+
72+
unsigned int crp_posted:1; /* rpc is posted */
73+
unsigned int crp_finished:1; /* rpc is finished */
74+
unsigned int crp_unpacked:1; /* reply is unpacked */
7575
/** RPC is embedded in other structure and can't free it */
76-
unsigned int crp_embedded:1;
77-
int crp_status; /* console rpc errors */
78-
unsigned long crp_stamp; /* replied time stamp */
76+
unsigned int crp_embedded:1;
77+
int crp_status; /* console rpc errors */
78+
unsigned long crp_stamp; /* replied time stamp */
7979
} lstcon_rpc_t;
8080

8181
typedef struct lstcon_rpc_trans {
82-
struct list_head tas_olink; /* link chain on owner list */
83-
struct list_head tas_link; /* link chain on global list */
84-
int tas_opc; /* operation code of transaction */
85-
unsigned tas_feats_updated; /* features mask is uptodate */
86-
unsigned tas_features; /* test features mask */
87-
wait_queue_head_t tas_waitq; /* wait queue head */
88-
atomic_t tas_remaining; /* # of un-scheduled rpcs */
82+
struct list_head tas_olink; /* link chain on owner list */
83+
struct list_head tas_link; /* link chain on global list */
84+
int tas_opc; /* operation code of transaction */
85+
unsigned tas_feats_updated; /* features mask is uptodate */
86+
unsigned tas_features; /* test features mask */
87+
wait_queue_head_t tas_waitq; /* wait queue head */
88+
atomic_t tas_remaining; /* # of un-scheduled rpcs */
8989
struct list_head tas_rpcs_list; /* queued requests */
9090
} lstcon_rpc_trans_t;
9191

92-
#define LST_TRANS_PRIVATE 0x1000
92+
#define LST_TRANS_PRIVATE 0x1000
9393

9494
#define LST_TRANS_SESNEW (LST_TRANS_PRIVATE | 0x01)
9595
#define LST_TRANS_SESEND (LST_TRANS_PRIVATE | 0x02)
9696
#define LST_TRANS_SESQRY 0x03
97-
#define LST_TRANS_SESPING 0x04
97+
#define LST_TRANS_SESPING 0x04
9898

99-
#define LST_TRANS_TSBCLIADD (LST_TRANS_PRIVATE | 0x11)
100-
#define LST_TRANS_TSBSRVADD (LST_TRANS_PRIVATE | 0x12)
99+
#define LST_TRANS_TSBCLIADD (LST_TRANS_PRIVATE | 0x11)
100+
#define LST_TRANS_TSBSRVADD (LST_TRANS_PRIVATE | 0x12)
101101
#define LST_TRANS_TSBRUN (LST_TRANS_PRIVATE | 0x13)
102-
#define LST_TRANS_TSBSTOP (LST_TRANS_PRIVATE | 0x14)
103-
#define LST_TRANS_TSBCLIQRY 0x15
104-
#define LST_TRANS_TSBSRVQRY 0x16
102+
#define LST_TRANS_TSBSTOP (LST_TRANS_PRIVATE | 0x14)
103+
#define LST_TRANS_TSBCLIQRY 0x15
104+
#define LST_TRANS_TSBSRVQRY 0x16
105105

106-
#define LST_TRANS_STATQRY 0x21
106+
#define LST_TRANS_STATQRY 0x21
107107

108108
typedef int (*lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
109109
typedef int (*lstcon_rpc_readent_func_t)(int, srpc_msg_t *,

drivers/staging/lustre/lnet/selftest/console.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
do { \
5050
if ((nd)->nd_state == LST_NODE_ACTIVE) \
5151
(p)->nle_nactive++; \
52-
else if ((nd)->nd_state == LST_NODE_BUSY) \
52+
else if ((nd)->nd_state == LST_NODE_BUSY) \
5353
(p)->nle_nbusy++; \
54-
else if ((nd)->nd_state == LST_NODE_DOWN) \
54+
else if ((nd)->nd_state == LST_NODE_DOWN) \
5555
(p)->nle_ndown++; \
5656
else \
5757
(p)->nle_nunknown++; \
@@ -1690,7 +1690,7 @@ int
16901690
lstcon_session_match(lst_sid_t sid)
16911691
{
16921692
return (console_session.ses_id.ses_nid == sid.ses_nid &&
1693-
console_session.ses_id.ses_stamp == sid.ses_stamp) ? 1 : 0;
1693+
console_session.ses_id.ses_stamp == sid.ses_stamp) ? 1 : 0;
16941694
}
16951695

16961696
static void
@@ -1723,7 +1723,7 @@ lstcon_session_new(char *name, int key, unsigned feats,
17231723
rc = lstcon_session_end();
17241724

17251725
/* lstcon_session_end() only return local error */
1726-
if (rc)
1726+
if (rc)
17271727
return rc;
17281728
}
17291729

drivers/staging/lustre/lnet/selftest/console.h

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -52,79 +52,79 @@
5252

5353
typedef struct lstcon_node {
5454
lnet_process_id_t nd_id; /* id of the node */
55-
int nd_ref; /* reference count */
56-
int nd_state; /* state of the node */
57-
int nd_timeout; /* session timeout */
58-
unsigned long nd_stamp; /* timestamp of last replied RPC */
55+
int nd_ref; /* reference count */
56+
int nd_state; /* state of the node */
57+
int nd_timeout; /* session timeout */
58+
unsigned long nd_stamp; /* timestamp of last replied RPC */
5959
struct lstcon_rpc nd_ping; /* ping rpc */
6060
} lstcon_node_t; /* node descriptor */
6161

6262
typedef struct {
6363
struct list_head ndl_link; /* chain on list */
6464
struct list_head ndl_hlink; /* chain on hash */
65-
lstcon_node_t *ndl_node; /* pointer to node */
65+
lstcon_node_t *ndl_node; /* pointer to node */
6666
} lstcon_ndlink_t; /* node link descriptor */
6767

6868
typedef struct {
69-
struct list_head grp_link; /* chain on global group list
69+
struct list_head grp_link; /* chain on global group list
7070
*/
71-
int grp_ref; /* reference count */
72-
int grp_userland; /* has userland nodes */
73-
int grp_nnode; /* # of nodes */
74-
char grp_name[LST_NAME_SIZE]; /* group name */
75-
76-
struct list_head grp_trans_list; /* transaction list */
77-
struct list_head grp_ndl_list; /* nodes list */
78-
struct list_head grp_ndl_hash[0]; /* hash table for nodes */
71+
int grp_ref; /* reference count */
72+
int grp_userland; /* has userland nodes */
73+
int grp_nnode; /* # of nodes */
74+
char grp_name[LST_NAME_SIZE]; /* group name */
75+
76+
struct list_head grp_trans_list; /* transaction list */
77+
struct list_head grp_ndl_list; /* nodes list */
78+
struct list_head grp_ndl_hash[0]; /* hash table for nodes */
7979
} lstcon_group_t; /* (alias of nodes) group descriptor */
8080

81-
#define LST_BATCH_IDLE 0xB0 /* idle batch */
81+
#define LST_BATCH_IDLE 0xB0 /* idle batch */
8282
#define LST_BATCH_RUNNING 0xB1 /* running batch */
8383

8484
typedef struct lstcon_tsb_hdr {
85-
lst_bid_t tsb_id; /* batch ID */
86-
int tsb_index; /* test index */
85+
lst_bid_t tsb_id; /* batch ID */
86+
int tsb_index; /* test index */
8787
} lstcon_tsb_hdr_t;
8888

8989
typedef struct {
90-
lstcon_tsb_hdr_t bat_hdr; /* test_batch header */
91-
struct list_head bat_link; /* chain on session's batches list */
92-
int bat_ntest; /* # of test */
93-
int bat_state; /* state of the batch */
94-
int bat_arg; /* parameter for run|stop, timeout
90+
lstcon_tsb_hdr_t bat_hdr; /* test_batch header */
91+
struct list_head bat_link; /* chain on session's batches list */
92+
int bat_ntest; /* # of test */
93+
int bat_state; /* state of the batch */
94+
int bat_arg; /* parameter for run|stop, timeout
9595
* for run, force for stop */
96-
char bat_name[LST_NAME_SIZE];/* name of batch */
96+
char bat_name[LST_NAME_SIZE];/* name of batch */
9797

9898
struct list_head bat_test_list; /* list head of tests (lstcon_test_t)
9999
*/
100100
struct list_head bat_trans_list; /* list head of transaction */
101-
struct list_head bat_cli_list; /* list head of client nodes
101+
struct list_head bat_cli_list; /* list head of client nodes
102102
* (lstcon_node_t) */
103103
struct list_head *bat_cli_hash; /* hash table of client nodes */
104-
struct list_head bat_srv_list; /* list head of server nodes */
104+
struct list_head bat_srv_list; /* list head of server nodes */
105105
struct list_head *bat_srv_hash; /* hash table of server nodes */
106106
} lstcon_batch_t; /* (tests ) batch descriptor */
107107

108108
typedef struct lstcon_test {
109-
lstcon_tsb_hdr_t tes_hdr; /* test batch header */
110-
struct list_head tes_link; /* chain on batch's tests list */
111-
lstcon_batch_t *tes_batch; /* pointer to batch */
112-
113-
int tes_type; /* type of the test, i.e: bulk, ping */
114-
int tes_stop_onerr; /* stop on error */
115-
int tes_oneside; /* one-sided test */
116-
int tes_concur; /* concurrency */
117-
int tes_loop; /* loop count */
118-
int tes_dist; /* nodes distribution of target group */
119-
int tes_span; /* nodes span of target group */
120-
int tes_cliidx; /* client index, used for RPC creating */
109+
lstcon_tsb_hdr_t tes_hdr; /* test batch header */
110+
struct list_head tes_link; /* chain on batch's tests list */
111+
lstcon_batch_t *tes_batch; /* pointer to batch */
112+
113+
int tes_type; /* type of the test, i.e: bulk, ping */
114+
int tes_stop_onerr; /* stop on error */
115+
int tes_oneside; /* one-sided test */
116+
int tes_concur; /* concurrency */
117+
int tes_loop; /* loop count */
118+
int tes_dist; /* nodes distribution of target group */
119+
int tes_span; /* nodes span of target group */
120+
int tes_cliidx; /* client index, used for RPC creating */
121121

122122
struct list_head tes_trans_list; /* transaction list */
123-
lstcon_group_t *tes_src_grp; /* group run the test */
124-
lstcon_group_t *tes_dst_grp; /* target group */
123+
lstcon_group_t *tes_src_grp; /* group run the test */
124+
lstcon_group_t *tes_dst_grp; /* target group */
125125

126-
int tes_paramlen; /* test parameter length */
127-
char tes_param[0]; /* test parameter */
126+
int tes_paramlen; /* test parameter length */
127+
char tes_param[0]; /* test parameter */
128128
} lstcon_test_t; /* a single test descriptor */
129129

130130
#define LST_GLOBAL_HASHSIZE 503 /* global nodes hash table size */
@@ -136,24 +136,24 @@ typedef struct lstcon_test {
136136
#define LST_CONSOLE_TIMEOUT 300 /* default console timeout */
137137

138138
struct lstcon_session {
139-
struct mutex ses_mutex; /* only 1 thread in session */
140-
lst_sid_t ses_id; /* global session id */
141-
int ses_key; /* local session key */
142-
int ses_state; /* state of session */
143-
int ses_timeout; /* timeout in seconds */
144-
time64_t ses_laststamp; /* last operation stamp (seconds)
139+
struct mutex ses_mutex; /* only 1 thread in session */
140+
lst_sid_t ses_id; /* global session id */
141+
int ses_key; /* local session key */
142+
int ses_state; /* state of session */
143+
int ses_timeout; /* timeout in seconds */
144+
time64_t ses_laststamp; /* last operation stamp (seconds)
145145
*/
146-
unsigned ses_features; /* tests features of the session
146+
unsigned ses_features; /* tests features of the session
147147
*/
148-
unsigned ses_feats_updated:1; /* features are synced with
148+
unsigned ses_feats_updated:1; /* features are synced with
149149
* remote test nodes */
150-
unsigned ses_force:1; /* force creating */
151-
unsigned ses_shutdown:1; /* session is shutting down */
152-
unsigned ses_expired:1; /* console is timedout */
153-
__u64 ses_id_cookie; /* batch id cookie */
154-
char ses_name[LST_NAME_SIZE];/* session name */
155-
lstcon_rpc_trans_t *ses_ping; /* session pinger */
156-
struct stt_timer ses_ping_timer; /* timer for pinger */
150+
unsigned ses_force:1; /* force creating */
151+
unsigned ses_shutdown:1; /* session is shutting down */
152+
unsigned ses_expired:1; /* console is timedout */
153+
__u64 ses_id_cookie; /* batch id cookie */
154+
char ses_name[LST_NAME_SIZE];/* session name */
155+
lstcon_rpc_trans_t *ses_ping; /* session pinger */
156+
struct stt_timer ses_ping_timer; /* timer for pinger */
157157
lstcon_trans_stat_t ses_trans_stat; /* transaction stats */
158158

159159
struct list_head ses_trans_list; /* global list of transaction */
@@ -162,8 +162,8 @@ struct lstcon_session {
162162
struct list_head ses_ndl_list; /* global list of nodes */
163163
struct list_head *ses_ndl_hash; /* hash table of nodes */
164164

165-
spinlock_t ses_rpc_lock; /* serialize */
166-
atomic_t ses_rpc_counter; /* # of initialized RPCs */
165+
spinlock_t ses_rpc_lock; /* serialize */
166+
atomic_t ses_rpc_counter; /* # of initialized RPCs */
167167
struct list_head ses_rpc_freelist; /* idle console rpc */
168168
}; /* session descriptor */
169169

0 commit comments

Comments
 (0)