Commit 30c0aa39 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ptlrpc: Fix style vs open parenthesis alignment 



This mostly fixes checkpatch complaints about
"Alignment should match open parenthesis"

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a742c93b

drivers/staging/lustre/lustre/ptlrpc/client.c

+16 −24
Original line number Diff line number Diff line
@@ -896,8 +896,7 @@ void ptlrpc_set_destroy(struct ptlrpc_request_set *set) 
			 RQ_PHASE_COMPLETE : RQ_PHASE_NEW;

	list_for_each(tmp, &set->set_requests) {

		struct ptlrpc_request *req =

			list_entry(tmp, struct ptlrpc_request,

				       rq_set_chain);

			list_entry(tmp, struct ptlrpc_request, rq_set_chain);



		LASSERT(req->rq_phase == expected_phase);

		n++;
@@ -909,8 +908,7 @@ void ptlrpc_set_destroy(struct ptlrpc_request_set *set) 


	list_for_each_safe(tmp, next, &set->set_requests) {

		struct ptlrpc_request *req =

			list_entry(tmp, struct ptlrpc_request,

				       rq_set_chain);

			list_entry(tmp, struct ptlrpc_request, rq_set_chain);

		list_del_init(&req->rq_set_chain);



		LASSERT(req->rq_phase == expected_phase);
@@ -1475,8 +1473,7 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set) 
	INIT_LIST_HEAD(&comp_reqs);

	list_for_each_safe(tmp, next, &set->set_requests) {

		struct ptlrpc_request *req =

			list_entry(tmp, struct ptlrpc_request,

				       rq_set_chain);

			list_entry(tmp, struct ptlrpc_request, rq_set_chain);

		struct obd_import *imp = req->rq_import;

		int unregistered = 0;

		int rc = 0;
@@ -1618,8 +1615,7 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set) 
					 */

					list_del_init(&req->rq_list);

					list_add_tail(&req->rq_list,

							  &imp->

							  imp_delayed_list);

						      &imp->imp_delayed_list);

					spin_unlock(&imp->imp_lock);

					continue;

				}
@@ -1944,8 +1940,7 @@ int ptlrpc_expired_set(void *data) 
	/* A timeout expired. See which reqs it applies to...  */

	list_for_each(tmp, &set->set_requests) {

		struct ptlrpc_request *req =

			list_entry(tmp, struct ptlrpc_request,

				       rq_set_chain);

			list_entry(tmp, struct ptlrpc_request, rq_set_chain);



		/* don't expire request waiting for context */

		if (req->rq_wait_ctx)
@@ -2001,8 +1996,7 @@ void ptlrpc_interrupted_set(void *data) 


	list_for_each(tmp, &set->set_requests) {

		struct ptlrpc_request *req =

			list_entry(tmp, struct ptlrpc_request,

				       rq_set_chain);

			list_entry(tmp, struct ptlrpc_request, rq_set_chain);



		if (req->rq_phase != RQ_PHASE_RPC &&

		    req->rq_phase != RQ_PHASE_UNREGISTERING)
@@ -2568,8 +2562,7 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req, 
	ptlrpc_request_addref(req);

	list_for_each_prev(tmp, &imp->imp_replay_list) {

		struct ptlrpc_request *iter =

			list_entry(tmp, struct ptlrpc_request,

				       rq_replay_list);

			list_entry(tmp, struct ptlrpc_request, rq_replay_list);



		/*

		 * We may have duplicate transnos if we create and then
@@ -2842,8 +2835,7 @@ void ptlrpc_abort_set(struct ptlrpc_request_set *set) 


	list_for_each_safe(pos, tmp, &set->set_requests) {

		struct ptlrpc_request *req =

			list_entry(pos, struct ptlrpc_request,

				       rq_set_chain);

			list_entry(pos, struct ptlrpc_request, rq_set_chain);



		spin_lock(&req->rq_lock);

		if (req->rq_phase != RQ_PHASE_RPC) {

drivers/staging/lustre/lustre/ptlrpc/import.c

+10 −11
Original line number Diff line number Diff line
@@ -1032,8 +1032,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env, 


		spin_lock(&imp->imp_lock);

		list_del(&imp->imp_conn_current->oic_item);

		list_add(&imp->imp_conn_current->oic_item,

			     &imp->imp_conn_list);

		list_add(&imp->imp_conn_current->oic_item, &imp->imp_conn_list);

		imp->imp_last_success_conn =

			imp->imp_conn_current->oic_last_attempt;

drivers/staging/lustre/lustre/ptlrpc/layout.c

+17 −18
Original line number Diff line number Diff line
@@ -1751,8 +1751,7 @@ static int __req_capsule_offset(const struct req_capsule *pill, 
	int offset;



	offset = field->rmf_offset[pill->rc_fmt->rf_idx][loc];

	LASSERTF(offset > 0, "%s:%s, off=%d, loc=%d\n",

			    pill->rc_fmt->rf_name,

	LASSERTF(offset > 0, "%s:%s, off=%d, loc=%d\n", pill->rc_fmt->rf_name,

		 field->rmf_name, offset, loc);

	offset--;

drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c

+7 −8
Original line number Diff line number Diff line
@@ -518,8 +518,7 @@ static int ptlrpc_lprocfs_nrs_seq_show(struct seq_file *m, void *n) 


		pol_idx = 0;



		list_for_each_entry(policy, &nrs->nrs_policy_list,

					pol_list) {

		list_for_each_entry(policy, &nrs->nrs_policy_list, pol_list) {

			LASSERT(pol_idx < num_pols);



			nrs_policy_get_info_locked(policy, &tmp);

drivers/staging/lustre/lustre/ptlrpc/nrs.c

+8 −11
Original line number Diff line number Diff line
@@ -978,8 +978,7 @@ static void nrs_svcpt_cleanup_locked(struct ptlrpc_service_part *svcpt) 
	nrs = nrs_svcpt2nrs(svcpt, hp);

	nrs->nrs_stopping = 1;



	list_for_each_entry_safe(policy, tmp, &nrs->nrs_policy_list,

				     pol_list) {

	list_for_each_entry_safe(policy, tmp, &nrs->nrs_policy_list, pol_list) {

		rc = nrs_policy_unregister(nrs, policy->pol_desc->pd_name);

		LASSERT(rc == 0);

	}
@@ -1446,8 +1445,7 @@ ptlrpc_nrs_req_get_nolock0(struct ptlrpc_service_part *svcpt, bool hp, 
	 * Always try to drain requests from all NRS polices even if they are

	 * inactive, because the user can change policy status at runtime.

	 */

	list_for_each_entry(policy, &nrs->nrs_policy_queued,

				pol_list_queued) {

	list_for_each_entry(policy, &nrs->nrs_policy_queued, pol_list_queued) {

		nrq = nrs_request_get(policy, peek, force);

		if (nrq) {

			if (likely(!peek)) {
@@ -1599,8 +1597,7 @@ void ptlrpc_nrs_fini(void) 
	struct ptlrpc_nrs_pol_desc *desc;

	struct ptlrpc_nrs_pol_desc *tmp;



	list_for_each_entry_safe(desc, tmp, &nrs_core.nrs_policies,

				     pd_list) {

	list_for_each_entry_safe(desc, tmp, &nrs_core.nrs_policies, pd_list) {

		list_del_init(&desc->pd_list);

		kfree(desc);

	}