openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: ldlm: Remove unnecessary braces at ifs 

checkpatch complains about three places where braces are not
necessary. This patch removes the braces.

Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andreas Ruprecht 2014-11-23 14:37:55 +01:00 committed by Greg Kroah-Hartman
parent b0e47b96e3
commit 8d2ff65da8
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
View File

@ -271,11 +271,10 @@ static void ldlm_pool_recalc_slv(struct ldlm_pool *pl)
slv = slv * slv_factor;
slv = dru(slv, LDLM_POOL_SLV_SHIFT, round_up);
if (slv > ldlm_pool_slv_max(limit)) {
if (slv > ldlm_pool_slv_max(limit))
slv = ldlm_pool_slv_max(limit);
} else if (slv < ldlm_pool_slv_min(limit)) {
else if (slv < ldlm_pool_slv_min(limit))
slv = ldlm_pool_slv_min(limit);
}
pl->pl_server_lock_volume = slv;
}
@ -1388,9 +1387,8 @@ static int ldlm_pools_thread_start(void)
static void ldlm_pools_thread_stop(void)
{
if (ldlm_pools_thread == NULL) {
if (ldlm_pools_thread == NULL)
return;
}
thread_set_flags(ldlm_pools_thread, SVC_STOPPING);
wake_up(&ldlm_pools_thread->t_ctl_waitq);

3
drivers/staging/lustre/lustre/ldlm/ldlm_request.c
View File

@ -245,9 +245,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
obd = class_exp2obd(lock->l_conn_export);
/* if this is a local lock, then there is no import */
if (obd != NULL) {
if (obd != NULL)
imp = obd->u.cli.cl_import;
}
/* Wait a long time for enqueue - server may have to callback a
lock from another client. Server will evict the other client if it