staging: lustre: fix aligments in lnet selftest

Some aligment issues were not caught by checkpatch. We address them
here. Some of the alignment issues caused greater than 80 character
checkpatch issues. Some changes were done to just make the code more
readable and to match our production code.

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c b/drivers/staging/lustre/lnet/selftest/conctl.c
index 872df72a221f9fccd21e2606856c91e512f775da..5c7cb72eac9a5b4ff59162b06aacd8352a26f38c 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/conctl.c
+++ b/drivers/staging/lustre/lnet/selftest/conctl.c
@@ -278,8 +278,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args)
        if (!name)
                return -ENOMEM;
 
-       if (copy_from_user(name,
-                          args->lstio_grp_namep,
+       if (copy_from_user(name, args->lstio_grp_namep,
                           args->lstio_grp_nmlen)) {
                LIBCFS_FREE(name, args->lstio_grp_nmlen + 1);
                return -EFAULT;
@@ -375,8 +374,8 @@ lst_group_list_ioctl(lstio_group_list_args_t *args)
                return -EINVAL;
 
        return lstcon_group_list(args->lstio_grp_idx,
-                             args->lstio_grp_nmlen,
-                             args->lstio_grp_namep);
+                                args->lstio_grp_nmlen,
+                                args->lstio_grp_namep);
 }
 
 static int
@@ -743,7 +742,8 @@ static int lst_test_add_ioctl(lstio_test_args_t *args)
        /* have parameter, check if parameter length is valid */
        if (args->lstio_tes_param &&
            (args->lstio_tes_param_len <= 0 ||
-            args->lstio_tes_param_len > PAGE_CACHE_SIZE - sizeof(lstcon_test_t)))
+            args->lstio_tes_param_len >
+            PAGE_CACHE_SIZE - sizeof(lstcon_test_t)))
                return -EINVAL;
 
        LIBCFS_ALLOC(batch_name, args->lstio_tes_bat_nmlen + 1);

diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c
index dc454ca8cd90d31a68332c67b96b4ae207d3e982..bcd78888f9cc3381b99e7bfb93d1b3fdc7f60869 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -235,8 +235,8 @@ lstcon_rpc_trans_name(int transop)
 }
 
 int
-lstcon_rpc_trans_prep(struct list_head *translist,
-                     int transop, lstcon_rpc_trans_t **transpp)
+lstcon_rpc_trans_prep(struct list_head *translist, int transop,
+                     lstcon_rpc_trans_t **transpp)
 {
        lstcon_rpc_trans_t *trans;
 
@@ -547,8 +547,7 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans)
        lstcon_rpc_t *tmp;
        int count = 0;
 
-       list_for_each_entry_safe(crpc, tmp, &trans->tas_rpcs_list,
-                                crp_link) {
+       list_for_each_entry_safe(crpc, tmp, &trans->tas_rpcs_list, crp_link) {
                rpc = crpc->crp_rpc;
 
                spin_lock(&rpc->crpc_lock);
@@ -668,8 +667,8 @@ lstcon_batrpc_prep(lstcon_node_t *nd, int transop, unsigned feats,
        brq->bar_bid = tsb->tsb_id;
        brq->bar_testidx = tsb->tsb_index;
        brq->bar_opc = transop == LST_TRANS_TSBRUN ? SRPC_BATCH_OPC_RUN :
-                          (transop == LST_TRANS_TSBSTOP ? SRPC_BATCH_OPC_STOP :
-                           SRPC_BATCH_OPC_QUERY);
+                      (transop == LST_TRANS_TSBSTOP ? SRPC_BATCH_OPC_STOP :
+                      SRPC_BATCH_OPC_QUERY);
 
        if (transop != LST_TRANS_TSBRUN &&
            transop != LST_TRANS_TSBSTOP)

diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index 6017f213b4d7b973494f6979656a48c15742e2cd..1a923ea3a7553456930efc9805d27154f3968b74 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -76,7 +76,8 @@ lstcon_node_find(lnet_process_id_t id, lstcon_node_t **ndpp, int create)
 
        LASSERT(id.nid != LNET_NID_ANY);
 
-       list_for_each_entry(ndl, &console_session.ses_ndl_hash[idx], ndl_hlink) {
+       list_for_each_entry(ndl, &console_session.ses_ndl_hash[idx],
+                           ndl_hlink) {
                if (ndl->ndl_node->nd_id.nid != id.nid ||
                    ndl->ndl_node->nd_id.pid != id.pid)
                        continue;
@@ -316,7 +317,7 @@ lstcon_group_ndlink_move(lstcon_group_t *old,
                         lstcon_group_t *new, lstcon_ndlink_t *ndl)
 {
        unsigned int idx = LNET_NIDADDR(ndl->ndl_node->nd_id.nid) %
-                          LST_NODE_HASHSIZE;
+                                       LST_NODE_HASHSIZE;
 
        list_del(&ndl->ndl_hlink);
        list_del(&ndl->ndl_link);
@@ -918,7 +919,7 @@ lstcon_batch_list(int index, int len, char __user *name_up)
        list_for_each_entry(bat, &console_session.ses_bat_list, bat_link) {
                if (!index--) {
                        return copy_to_user(name_up, bat->bat_name, len) ?
-                              -EFAULT : 0;
+                                           -EFAULT : 0;
                }
        }
 

diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
index 55f92da02bc09dba5e13daa3d567b08f742e9989..926c3970c498e1b461739b0c10808bb487a1fc46 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -406,7 +406,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply)
 {
        sfw_session_t *sn = sfw_data.fw_session;
        srpc_msg_t *msg = container_of(request, srpc_msg_t,
-                                         msg_body.mksn_reqst);
+                                      msg_body.mksn_reqst);
        int cplen = 0;
 
        if (request->mksn_sid.ses_nid == LNET_NID_ANY) {
@@ -1017,8 +1017,7 @@ sfw_run_batch(sfw_batch_t *tsb)
                        tsu->tsu_loop = tsi->tsi_loop;
                        wi = &tsu->tsu_worker;
                        swi_init_workitem(wi, tsu, sfw_run_test,
-                                         lst_sched_test[\
-                                         lnet_cpt_of_nid(tsu->tsu_dest.nid)]);
+                                         lst_sched_test[lnet_cpt_of_nid(tsu->tsu_dest.nid)]);
                        swi_schedule_workitem(wi);
                }
        }

diff --git a/drivers/staging/lustre/lnet/selftest/module.c b/drivers/staging/lustre/lnet/selftest/module.c
index 1e858e9121cc09a16b55956df628fae049c9fc9e..cc046b1d4d0abb645135a42c35123f794d0efb1f 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/module.c
+++ b/drivers/staging/lustre/lnet/selftest/module.c
@@ -116,8 +116,7 @@ lnet_selftest_init(void)
                rc = cfs_wi_sched_create("lst_t", lnet_cpt_table(), i,
                                         nthrs, &lst_sched_test[i]);
                if (rc) {
-                       CERROR("Failed to create CPT affinity WI scheduler %d for LST\n",
-                              i);
+                       CERROR("Failed to create CPT affinity WI scheduler %d for LST\n", i);
                        goto error;
                }
        }