Skip to content

Commit ec436b9

Browse files
jamesasimmonsgregkh
jamesasimmons
authored and
gregkh
committed
staging: lustre: remove extra spacing when setting variable for lnet selftest
Remove any extra spacing for the lines of code setting variables to some value. Signed-off-by: James Simmons <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 00b5fdb commit ec436b9

File tree

7 files changed

+174
-174
lines changed

7 files changed

+174
-174
lines changed

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ brw_client_init(sfw_test_instance_t *tsi)
8383
if (!(sn->sn_features & LST_FEAT_BULK_LEN)) {
8484
test_bulk_req_t *breq = &tsi->tsi_u.bulk_v0;
8585

86-
opc = breq->blk_opc;
86+
opc = breq->blk_opc;
8787
flags = breq->blk_flags;
88-
npg = breq->blk_npg;
88+
npg = breq->blk_npg;
8989
/*
9090
* NB: this is not going to work for variable page size,
9191
* but we have to keep it for compatibility
9292
*/
93-
len = npg * PAGE_CACHE_SIZE;
93+
len = npg * PAGE_CACHE_SIZE;
9494

9595
} else {
9696
test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
@@ -101,10 +101,10 @@ brw_client_init(sfw_test_instance_t *tsi)
101101
*/
102102
LASSERT(!(sn->sn_features & ~LST_FEATS_MASK));
103103

104-
opc = breq->blk_opc;
104+
opc = breq->blk_opc;
105105
flags = breq->blk_flags;
106-
len = breq->blk_len;
107-
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
106+
len = breq->blk_len;
107+
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
108108
}
109109

110110
if (npg > LNET_MAX_IOV || npg <= 0)
@@ -275,10 +275,10 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
275275
if (!(sn->sn_features & LST_FEAT_BULK_LEN)) {
276276
test_bulk_req_t *breq = &tsi->tsi_u.bulk_v0;
277277

278-
opc = breq->blk_opc;
278+
opc = breq->blk_opc;
279279
flags = breq->blk_flags;
280-
npg = breq->blk_npg;
281-
len = npg * PAGE_CACHE_SIZE;
280+
npg = breq->blk_npg;
281+
len = npg * PAGE_CACHE_SIZE;
282282

283283
} else {
284284
test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
@@ -289,10 +289,10 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
289289
*/
290290
LASSERT(!(sn->sn_features & ~LST_FEATS_MASK));
291291

292-
opc = breq->blk_opc;
292+
opc = breq->blk_opc;
293293
flags = breq->blk_flags;
294-
len = breq->blk_len;
295-
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
294+
len = breq->blk_len;
295+
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
296296
}
297297

298298
rc = sfw_create_test_rpc(tsu, dest, sn->sn_features, npg, len, &rpc);
@@ -307,8 +307,8 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
307307

308308
req = &rpc->crpc_reqstmsg.msg_body.brw_reqst;
309309
req->brw_flags = flags;
310-
req->brw_rw = opc;
311-
req->brw_len = len;
310+
req->brw_rw = opc;
311+
req->brw_len = len;
312312

313313
*rpcpp = rpc;
314314
return 0;
@@ -493,18 +493,18 @@ brw_server_handle(struct srpc_server_rpc *rpc)
493493
sfw_test_client_ops_t brw_test_client;
494494
void brw_init_test_client(void)
495495
{
496-
brw_test_client.tso_init = brw_client_init;
497-
brw_test_client.tso_fini = brw_client_fini;
496+
brw_test_client.tso_init = brw_client_init;
497+
brw_test_client.tso_fini = brw_client_fini;
498498
brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
499499
brw_test_client.tso_done_rpc = brw_client_done_rpc;
500500
};
501501

502502
srpc_service_t brw_test_service;
503503
void brw_init_test_service(void)
504504
{
505-
brw_test_service.sv_id = SRPC_SERVICE_BRW;
506-
brw_test_service.sv_name = "brw_test";
507-
brw_test_service.sv_handler = brw_server_handle;
505+
brw_test_service.sv_id = SRPC_SERVICE_BRW;
506+
brw_test_service.sv_name = "brw_test";
507+
brw_test_service.sv_handler = brw_server_handle;
508508
brw_test_service.sv_bulk_ready = brw_bulk_ready;
509-
brw_test_service.sv_wi_total = brw_srv_workitems;
509+
brw_test_service.sv_wi_total = brw_srv_workitems;
510510
}

‎drivers/staging/lustre/lnet/selftest/conrpc.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ lstcon_rpc_done(srpc_client_rpc_t *rpc)
7878
/* not aborted */
7979
LASSERT(!crpc->crp_status);
8080

81-
crpc->crp_stamp = cfs_time_current();
81+
crpc->crp_stamp = cfs_time_current();
8282
crpc->crp_status = rpc->crpc_status;
8383
}
8484

@@ -99,13 +99,13 @@ lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats,
9999
if (!crpc->crp_rpc)
100100
return -ENOMEM;
101101

102-
crpc->crp_trans = NULL;
103-
crpc->crp_node = nd;
104-
crpc->crp_posted = 0;
102+
crpc->crp_trans = NULL;
103+
crpc->crp_node = nd;
104+
crpc->crp_posted = 0;
105105
crpc->crp_finished = 0;
106106
crpc->crp_unpacked = 0;
107-
crpc->crp_status = 0;
108-
crpc->crp_stamp = 0;
107+
crpc->crp_status = 0;
108+
crpc->crp_stamp = 0;
109109
crpc->crp_embedded = embedded;
110110
INIT_LIST_HEAD(&crpc->crp_link);
111111

@@ -306,7 +306,7 @@ lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error)
306306
continue;
307307
}
308308

309-
crpc->crp_stamp = cfs_time_current();
309+
crpc->crp_stamp = cfs_time_current();
310310
crpc->crp_status = error;
311311

312312
spin_unlock(&rpc->crpc_lock);
@@ -571,7 +571,7 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans)
571571
*/
572572
LASSERT(crpc->crp_status);
573573

574-
crpc->crp_node = NULL;
574+
crpc->crp_node = NULL;
575575
crpc->crp_trans = NULL;
576576
list_del_init(&crpc->crp_link);
577577
count++;
@@ -609,8 +609,8 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop,
609609
return rc;
610610

611611
msrq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.mksn_reqst;
612-
msrq->mksn_sid = console_session.ses_id;
613-
msrq->mksn_force = console_session.ses_force;
612+
msrq->mksn_sid = console_session.ses_id;
613+
msrq->mksn_force = console_session.ses_force;
614614
strlcpy(msrq->mksn_name, console_session.ses_name,
615615
sizeof(msrq->mksn_name));
616616
break;
@@ -644,7 +644,7 @@ lstcon_dbgrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc)
644644

645645
drq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.dbg_reqst;
646646

647-
drq->dbg_sid = console_session.ses_id;
647+
drq->dbg_sid = console_session.ses_id;
648648
drq->dbg_flags = 0;
649649

650650
return rc;
@@ -664,10 +664,10 @@ lstcon_batrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
664664

665665
brq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.bat_reqst;
666666

667-
brq->bar_sid = console_session.ses_id;
668-
brq->bar_bid = tsb->tsb_id;
667+
brq->bar_sid = console_session.ses_id;
668+
brq->bar_bid = tsb->tsb_id;
669669
brq->bar_testidx = tsb->tsb_index;
670-
brq->bar_opc = transop == LST_TRANS_TSBRUN ? SRPC_BATCH_OPC_RUN :
670+
brq->bar_opc = transop == LST_TRANS_TSBRUN ? SRPC_BATCH_OPC_RUN :
671671
(transop == LST_TRANS_TSBSTOP ? SRPC_BATCH_OPC_STOP :
672672
SRPC_BATCH_OPC_QUERY);
673673

@@ -695,7 +695,7 @@ lstcon_statrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc)
695695

696696
srq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.stat_reqst;
697697

698-
srq->str_sid = console_session.ses_id;
698+
srq->str_sid = console_session.ses_id;
699699
srq->str_type = 0; /* XXX remove it */
700700

701701
return 0;
@@ -735,7 +735,7 @@ lstcon_dstnodes_prep(lstcon_group_t *grp, int idx,
735735
return -EINVAL;
736736

737737
start = ((idx / dist) * span) % grp->grp_nnode;
738-
end = ((idx / dist) * span + span - 1) % grp->grp_nnode;
738+
end = ((idx / dist) * span + span - 1) % grp->grp_nnode;
739739

740740
list_for_each_entry(ndl, &grp->grp_ndl_list, ndl_link) {
741741
nd = ndl->ndl_node;
@@ -775,7 +775,7 @@ lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req)
775775
{
776776
test_ping_req_t *prq = &req->tsr_u.ping;
777777

778-
prq->png_size = param->png_size;
778+
prq->png_size = param->png_size;
779779
prq->png_flags = param->png_flags;
780780
/* TODO dest */
781781
return 0;
@@ -786,9 +786,9 @@ lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req)
786786
{
787787
test_bulk_req_t *brq = &req->tsr_u.bulk_v0;
788788

789-
brq->blk_opc = param->blk_opc;
790-
brq->blk_npg = (param->blk_size + PAGE_CACHE_SIZE - 1) /
791-
PAGE_CACHE_SIZE;
789+
brq->blk_opc = param->blk_opc;
790+
brq->blk_npg = (param->blk_size + PAGE_CACHE_SIZE - 1) /
791+
PAGE_CACHE_SIZE;
792792
brq->blk_flags = param->blk_flags;
793793

794794
return 0;
@@ -799,9 +799,9 @@ lstcon_bulkrpc_v1_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req)
799799
{
800800
test_bulk_req_v1_t *brq = &req->tsr_u.bulk_v1;
801801

802-
brq->blk_opc = param->blk_opc;
803-
brq->blk_flags = param->blk_flags;
804-
brq->blk_len = param->blk_size;
802+
brq->blk_opc = param->blk_opc;
803+
brq->blk_flags = param->blk_flags;
804+
brq->blk_len = param->blk_size;
805805
brq->blk_offset = 0; /* reserved */
806806

807807
return 0;
@@ -818,7 +818,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
818818
int i;
819819
int npg = 0;
820820
int nob = 0;
821-
int rc = 0;
821+
int rc = 0;
822822

823823
if (transop == LST_TRANS_TSBCLIADD) {
824824
npg = sfw_id_pages(test->tes_span);
@@ -831,7 +831,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
831831
if (rc)
832832
return rc;
833833

834-
trq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.tes_reqst;
834+
trq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.tes_reqst;
835835

836836
if (transop == LST_TRANS_TSBSRVADD) {
837837
int ndist = (sgrp->grp_nnode + test->tes_dist - 1) /
@@ -841,7 +841,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
841841
int nmax = (ndist + nspan - 1) / nspan;
842842

843843
trq->tsr_ndest = 0;
844-
trq->tsr_loop = nmax * test->tes_dist * test->tes_concur;
844+
trq->tsr_loop = nmax * test->tes_dist * test->tes_concur;
845845

846846
} else {
847847
bulk = &(*crpc)->crp_rpc->crpc_bulk;
@@ -857,8 +857,8 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
857857
nob -= len;
858858

859859
bulk->bk_iovs[i].kiov_offset = 0;
860-
bulk->bk_iovs[i].kiov_len = len;
861-
bulk->bk_iovs[i].kiov_page =
860+
bulk->bk_iovs[i].kiov_len = len;
861+
bulk->bk_iovs[i].kiov_page =
862862
alloc_page(GFP_KERNEL);
863863

864864
if (!bulk->bk_iovs[i].kiov_page) {
@@ -882,13 +882,13 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
882882
}
883883

884884
trq->tsr_ndest = test->tes_span;
885-
trq->tsr_loop = test->tes_loop;
885+
trq->tsr_loop = test->tes_loop;
886886
}
887887

888-
trq->tsr_sid = console_session.ses_id;
889-
trq->tsr_bid = test->tes_hdr.tsb_id;
890-
trq->tsr_concur = test->tes_concur;
891-
trq->tsr_is_client = (transop == LST_TRANS_TSBCLIADD) ? 1 : 0;
888+
trq->tsr_sid = console_session.ses_id;
889+
trq->tsr_bid = test->tes_hdr.tsb_id;
890+
trq->tsr_concur = test->tes_concur;
891+
trq->tsr_is_client = (transop == LST_TRANS_TSBCLIADD) ? 1 : 0;
892892
trq->tsr_stop_onerr = !!test->tes_stop_onerr;
893893

894894
switch (test->tes_type) {
@@ -1262,7 +1262,7 @@ lstcon_rpc_pinger(void *arg)
12621262

12631263
drq = &crpc->crp_rpc->crpc_reqstmsg.msg_body.dbg_reqst;
12641264

1265-
drq->dbg_sid = console_session.ses_id;
1265+
drq->dbg_sid = console_session.ses_id;
12661266
drq->dbg_flags = 0;
12671267

12681268
lstcon_rpc_trans_addreq(trans, crpc);

0 commit comments

Comments
 (0)