Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71e8dd9a authored by Antonio Murdaca's avatar Antonio Murdaca Committed by Greg Kroah-Hartman
Browse files

staging: lustre: cleanup not needed else clauses 



cleanup checkpatch.pl warnings about not needed else
clauses after a break or return

Signed-off-by: default avatarAntonio Murdaca <antonio.murdaca@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ee81443

drivers/staging/lustre/lustre/fid/fid_request.c

+2 −3
Original line number Diff line number Diff line
@@ -203,10 +203,9 @@ static int seq_client_alloc_seq(const struct lu_env *env, 
			CERROR("%s: Can't allocate new meta-sequence, rc %d\n",

			       seq->lcs_name, rc);

			return rc;

		} else {

		}

		CDEBUG(D_INFO, "%s: New range - "DRANGE"\n",

		       seq->lcs_name, PRANGE(&seq->lcs_space));

		}

	} else {

		rc = 0;

	}

drivers/staging/lustre/lustre/include/lprocfs_status.h

+1 −2
Original line number Diff line number Diff line
@@ -421,9 +421,8 @@ static inline int lprocfs_stats_lock(struct lprocfs_stats *stats, int opc, 
			else

				spin_lock(&stats->ls_lock);

			return 1;

		} else {

			return stats->ls_biggest_alloc_num;

		}

		return stats->ls_biggest_alloc_num;

	}

}

drivers/staging/lustre/lustre/ldlm/ldlm_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -667,10 +667,9 @@ int target_send_reply_msg(struct ptlrpc_request *req, int rc, int fail_id) 
		DEBUG_REQ(D_NET, req, "processing error (%d)", rc);

		req->rq_status = rc;

		return ptlrpc_send_error(req, 1);

	} else {

		DEBUG_REQ(D_NET, req, "sending reply");

	}



	DEBUG_REQ(D_NET, req, "sending reply");

	return ptlrpc_send_reply(req, PTLRPC_REPLY_MAYBE_DIFFICULT);

}

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+6 −5
Original line number Diff line number Diff line
@@ -931,7 +931,9 @@ static void search_granted_lock(struct list_head *queue, 
			prev->mode_link = &mode_end->l_sl_mode;

			prev->policy_link = &req->l_sl_policy;

			return;

		} else if (lock->l_resource->lr_type == LDLM_IBITS) {

		}



		if (lock->l_resource->lr_type == LDLM_IBITS) {

			for (;;) {

				policy_end =

					list_entry(lock->l_sl_policy.prev,
@@ -967,11 +969,10 @@ static void search_granted_lock(struct list_head *queue, 
			prev->mode_link = &mode_end->l_sl_mode;

			prev->policy_link = &req->l_sl_policy;

			return;

		} else {

			LDLM_ERROR(lock,

				   "is not LDLM_PLAIN or LDLM_IBITS lock");

			LBUG();

		}



		LDLM_ERROR(lock, "is not LDLM_PLAIN or LDLM_IBITS lock");

		LBUG();

	}



	/* insert point is last lock on the queue,

drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

+1 −2
Original line number Diff line number Diff line
@@ -1401,7 +1401,6 @@ static int ldlm_pools_thread_main(void *arg) 


		if (thread_test_and_clear_flags(thread, SVC_STOPPING))

			break;

		else

		thread_test_and_clear_flags(thread, SVC_EVENT);

	}