Skip to content

Commit

Permalink
staging: lustre: remove extra spacing when setting variable for lnet …
Browse files Browse the repository at this point in the history 
…selftest

Remove any extra spacing for the lines of code setting variables to
some value.

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
James Simmons authored and Greg Kroah-Hartman committed Mar 12, 2016
1 parent 00b5fdb commit ec436b9
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 174 deletions.
40 changes: 20 additions & 20 deletions drivers/staging/lustre/lnet/selftest/brw_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ brw_client_init(sfw_test_instance_t *tsi)
if (!(sn->sn_features & LST_FEAT_BULK_LEN)) {
test_bulk_req_t *breq = &tsi->tsi_u.bulk_v0;

opc = breq->blk_opc;
opc = breq->blk_opc;
flags = breq->blk_flags;
npg = breq->blk_npg;
npg = breq->blk_npg;
/*
* NB: this is not going to work for variable page size,
* but we have to keep it for compatibility
*/
len = npg * PAGE_CACHE_SIZE;
len = npg * PAGE_CACHE_SIZE;

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

opc = breq->blk_opc;
opc = breq->blk_opc;
flags = breq->blk_flags;
len = breq->blk_len;
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
len = breq->blk_len;
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
}

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

opc = breq->blk_opc;
opc = breq->blk_opc;
flags = breq->blk_flags;
npg = breq->blk_npg;
len = npg * PAGE_CACHE_SIZE;
npg = breq->blk_npg;
len = npg * PAGE_CACHE_SIZE;

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

opc = breq->blk_opc;
opc = breq->blk_opc;
flags = breq->blk_flags;
len = breq->blk_len;
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
len = breq->blk_len;
npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
}

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

req = &rpc->crpc_reqstmsg.msg_body.brw_reqst;
req->brw_flags = flags;
req->brw_rw = opc;
req->brw_len = len;
req->brw_rw = opc;
req->brw_len = len;

*rpcpp = rpc;
return 0;
Expand Down Expand Up @@ -493,18 +493,18 @@ brw_server_handle(struct srpc_server_rpc *rpc)
sfw_test_client_ops_t brw_test_client;
void brw_init_test_client(void)
{
brw_test_client.tso_init = brw_client_init;
brw_test_client.tso_fini = brw_client_fini;
brw_test_client.tso_init = brw_client_init;
brw_test_client.tso_fini = brw_client_fini;
brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
brw_test_client.tso_done_rpc = brw_client_done_rpc;
};

srpc_service_t brw_test_service;
void brw_init_test_service(void)
{
brw_test_service.sv_id = SRPC_SERVICE_BRW;
brw_test_service.sv_name = "brw_test";
brw_test_service.sv_handler = brw_server_handle;
brw_test_service.sv_id = SRPC_SERVICE_BRW;
brw_test_service.sv_name = "brw_test";
brw_test_service.sv_handler = brw_server_handle;
brw_test_service.sv_bulk_ready = brw_bulk_ready;
brw_test_service.sv_wi_total = brw_srv_workitems;
brw_test_service.sv_wi_total = brw_srv_workitems;
}
68 changes: 34 additions & 34 deletions drivers/staging/lustre/lnet/selftest/conrpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ lstcon_rpc_done(srpc_client_rpc_t *rpc)
/* not aborted */
LASSERT(!crpc->crp_status);

crpc->crp_stamp = cfs_time_current();
crpc->crp_stamp = cfs_time_current();
crpc->crp_status = rpc->crpc_status;
}

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

crpc->crp_trans = NULL;
crpc->crp_node = nd;
crpc->crp_posted = 0;
crpc->crp_trans = NULL;
crpc->crp_node = nd;
crpc->crp_posted = 0;
crpc->crp_finished = 0;
crpc->crp_unpacked = 0;
crpc->crp_status = 0;
crpc->crp_stamp = 0;
crpc->crp_status = 0;
crpc->crp_stamp = 0;
crpc->crp_embedded = embedded;
INIT_LIST_HEAD(&crpc->crp_link);

Expand Down Expand Up @@ -306,7 +306,7 @@ lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error)
continue;
}

crpc->crp_stamp = cfs_time_current();
crpc->crp_stamp = cfs_time_current();
crpc->crp_status = error;

spin_unlock(&rpc->crpc_lock);
Expand Down Expand Up @@ -571,7 +571,7 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans)
*/
LASSERT(crpc->crp_status);

crpc->crp_node = NULL;
crpc->crp_node = NULL;
crpc->crp_trans = NULL;
list_del_init(&crpc->crp_link);
count++;
Expand Down Expand Up @@ -609,8 +609,8 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop,
return rc;

msrq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.mksn_reqst;
msrq->mksn_sid = console_session.ses_id;
msrq->mksn_force = console_session.ses_force;
msrq->mksn_sid = console_session.ses_id;
msrq->mksn_force = console_session.ses_force;
strlcpy(msrq->mksn_name, console_session.ses_name,
sizeof(msrq->mksn_name));
break;
Expand Down Expand Up @@ -644,7 +644,7 @@ lstcon_dbgrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc)

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

drq->dbg_sid = console_session.ses_id;
drq->dbg_sid = console_session.ses_id;
drq->dbg_flags = 0;

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

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

brq->bar_sid = console_session.ses_id;
brq->bar_bid = tsb->tsb_id;
brq->bar_sid = console_session.ses_id;
brq->bar_bid = tsb->tsb_id;
brq->bar_testidx = tsb->tsb_index;
brq->bar_opc = transop == LST_TRANS_TSBRUN ? SRPC_BATCH_OPC_RUN :
brq->bar_opc = transop == LST_TRANS_TSBRUN ? SRPC_BATCH_OPC_RUN :
(transop == LST_TRANS_TSBSTOP ? SRPC_BATCH_OPC_STOP :
SRPC_BATCH_OPC_QUERY);

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

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

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

return 0;
Expand Down Expand Up @@ -735,7 +735,7 @@ lstcon_dstnodes_prep(lstcon_group_t *grp, int idx,
return -EINVAL;

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

list_for_each_entry(ndl, &grp->grp_ndl_list, ndl_link) {
nd = ndl->ndl_node;
Expand Down Expand Up @@ -775,7 +775,7 @@ lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req)
{
test_ping_req_t *prq = &req->tsr_u.ping;

prq->png_size = param->png_size;
prq->png_size = param->png_size;
prq->png_flags = param->png_flags;
/* TODO dest */
return 0;
Expand All @@ -786,9 +786,9 @@ lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req)
{
test_bulk_req_t *brq = &req->tsr_u.bulk_v0;

brq->blk_opc = param->blk_opc;
brq->blk_npg = (param->blk_size + PAGE_CACHE_SIZE - 1) /
PAGE_CACHE_SIZE;
brq->blk_opc = param->blk_opc;
brq->blk_npg = (param->blk_size + PAGE_CACHE_SIZE - 1) /
PAGE_CACHE_SIZE;
brq->blk_flags = param->blk_flags;

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

brq->blk_opc = param->blk_opc;
brq->blk_flags = param->blk_flags;
brq->blk_len = param->blk_size;
brq->blk_opc = param->blk_opc;
brq->blk_flags = param->blk_flags;
brq->blk_len = param->blk_size;
brq->blk_offset = 0; /* reserved */

return 0;
Expand All @@ -818,7 +818,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
int i;
int npg = 0;
int nob = 0;
int rc = 0;
int rc = 0;

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

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

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

trq->tsr_ndest = 0;
trq->tsr_loop = nmax * test->tes_dist * test->tes_concur;
trq->tsr_loop = nmax * test->tes_dist * test->tes_concur;

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

bulk->bk_iovs[i].kiov_offset = 0;
bulk->bk_iovs[i].kiov_len = len;
bulk->bk_iovs[i].kiov_page =
bulk->bk_iovs[i].kiov_len = len;
bulk->bk_iovs[i].kiov_page =
alloc_page(GFP_KERNEL);

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

trq->tsr_ndest = test->tes_span;
trq->tsr_loop = test->tes_loop;
trq->tsr_loop = test->tes_loop;
}

trq->tsr_sid = console_session.ses_id;
trq->tsr_bid = test->tes_hdr.tsb_id;
trq->tsr_concur = test->tes_concur;
trq->tsr_is_client = (transop == LST_TRANS_TSBCLIADD) ? 1 : 0;
trq->tsr_sid = console_session.ses_id;
trq->tsr_bid = test->tes_hdr.tsb_id;
trq->tsr_concur = test->tes_concur;
trq->tsr_is_client = (transop == LST_TRANS_TSBCLIADD) ? 1 : 0;
trq->tsr_stop_onerr = !!test->tes_stop_onerr;

switch (test->tes_type) {
Expand Down Expand Up @@ -1262,7 +1262,7 @@ lstcon_rpc_pinger(void *arg)

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

drq->dbg_sid = console_session.ses_id;
drq->dbg_sid = console_session.ses_id;
drq->dbg_flags = 0;

lstcon_rpc_trans_addreq(trans, crpc);
Expand Down
Loading

0 comments on commit ec436b9

Please sign in to comment.