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>

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
index c8c7aee4ed5eaff84b7911cc33ad23f09472a39d..55503e461dc92ef2f8690544243afbfea9245d4f 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
@@ -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);

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index a9a04ded91ef9a2633fe874647b882f0b7a2e2fb..287da325d92874291c47186ade8a2d761805fbcd 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -245,9 +245,8 @@ noreproc:
        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