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

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
......@@ -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));
}
CDEBUG(D_INFO, "%s: New range - "DRANGE"\n",
seq->lcs_name, PRANGE(&seq->lcs_space));
} else {
rc = 0;
}
......
......@@ -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;
}
}
......
......@@ -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);
}
......
......@@ -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,
......
......@@ -1401,8 +1401,7 @@ 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);
thread_test_and_clear_flags(thread, SVC_EVENT);
}
thread_set_flags(thread, SVC_STOPPED);
......
......@@ -607,8 +607,7 @@ void lov_update_statfs(struct obd_statfs *osfs, struct obd_statfs *lov_sfs,
if (tmp & 1) {
if (quit)
break;
else
quit = 1;
quit = 1;
shift = 0;
}
tmp >>= 1;
......
......@@ -75,11 +75,11 @@ static int mdc_unpack_capa(struct obd_export *exp, struct ptlrpc_request *req,
if (IS_ERR(c)) {
CDEBUG(D_INFO, "alloc capa failed!\n");
return PTR_ERR(c);
} else {
c->c_capa = *capa;
*oc = c;
return 0;
}
c->c_capa = *capa;
*oc = c;
return 0;
}
static inline int mdc_queue_wait(struct ptlrpc_request *req)
......
......@@ -906,10 +906,8 @@ struct lu_env *cl_env_nested_get(struct cl_env_nest *nest)
if (env != NULL) {
if (!cl_io_is_going(env))
return env;
else {
cl_env_put(env, &nest->cen_refcheck);
nest->cen_cookie = cl_env_reenter();
}
cl_env_put(env, &nest->cen_refcheck);
nest->cen_cookie = cl_env_reenter();
}
env = cl_env_get(&nest->cen_refcheck);
if (IS_ERR(env)) {
......
......@@ -279,9 +279,8 @@ static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
up_read(&cathandle->lgh_lock);
return loghandle;
} else {
up_write(&loghandle->lgh_lock);
}
up_write(&loghandle->lgh_lock);
}
up_read(&cathandle->lgh_lock);
......@@ -299,9 +298,8 @@ static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
if (loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
up_write(&cathandle->lgh_lock);
return loghandle;
} else {
up_write(&loghandle->lgh_lock);
}
up_write(&loghandle->lgh_lock);
}
CDEBUG(D_INODE, "use next log\n");
......
......@@ -1176,8 +1176,7 @@ static int osc_lock_wait(const struct lu_env *env,
/* It is from enqueue RPC reply upcall for
* updating state. Do not re-enqueue. */
return -ENAVAIL;
else
olck->ols_state = OLS_NEW;
olck->ols_state = OLS_NEW;
} else {
LASSERT(lock->cll_error);
return lock->cll_error;
......
......@@ -1007,8 +1007,8 @@ static int osc_should_shrink_grant(struct client_obd *client)
if (client->cl_import->imp_state == LUSTRE_IMP_FULL &&
client->cl_avail_grant > brw_size)
return 1;
else
osc_update_next_shrink(client);
osc_update_next_shrink(client);
}
return 0;
}
......@@ -2299,7 +2299,9 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
ldlm_lock_decref(lockh, mode);
LDLM_LOCK_PUT(matched);
return -ECANCELED;
} else if (osc_set_lock_data_with_check(matched, einfo)) {
}
if (osc_set_lock_data_with_check(matched, einfo)) {
*flags |= LDLM_FL_LVB_READY;
/* addref the lock only if not async requests and PW
* lock is matched whereas we asked for PR. */
......@@ -2324,10 +2326,10 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
ldlm_lock_decref(lockh, einfo->ei_mode);
LDLM_LOCK_PUT(matched);
return ELDLM_OK;
} else {
ldlm_lock_decref(lockh, mode);
LDLM_LOCK_PUT(matched);
}
ldlm_lock_decref(lockh, mode);
LDLM_LOCK_PUT(matched);
}
no_match:
......
......@@ -289,12 +289,10 @@ static int ptlrpc_pinger_main(void *arg)
thread_is_stopping(thread) ||
thread_is_event(thread),
&lwi);
if (thread_test_and_clear_flags(thread, SVC_STOPPING)) {
if (thread_test_and_clear_flags(thread, SVC_STOPPING))
break;
} else {
/* woken after adding import to reset timer */
thread_test_and_clear_flags(thread, SVC_EVENT);
}
/* woken after adding import to reset timer */
thread_test_and_clear_flags(thread, SVC_EVENT);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment