staging: lustre: remove unnecessary braces

This patch fixes checkpatch warnings: "WARNING: braces {} are not
necessary for single statement blocks" and "WARNING: braces {} are not
necessary for any arm of this statement".

Signed-off-by: Thibaut Robert <thibaut.robert@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index 3663c5cdb051fe4cdbddbf1a0ad0df89241998c9..4dc7baee1f2890a94e15f2fc9e22e844462de6e9 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -363,17 +363,16 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
         */
        cli->cl_chunkbits = PAGE_SHIFT;
 
-       if (!strcmp(name, LUSTRE_MDC_NAME)) {
+       if (!strcmp(name, LUSTRE_MDC_NAME))
                cli->cl_max_rpcs_in_flight = OBD_MAX_RIF_DEFAULT;
-       } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 128 /* MB */) {
+       else if (totalram_pages >> (20 - PAGE_SHIFT) <= 128 /* MB */)
                cli->cl_max_rpcs_in_flight = 2;
-       } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 256 /* MB */) {
+       else if (totalram_pages >> (20 - PAGE_SHIFT) <= 256 /* MB */)
                cli->cl_max_rpcs_in_flight = 3;
-       } else if (totalram_pages >> (20 - PAGE_SHIFT) <= 512 /* MB */) {
+       else if (totalram_pages >> (20 - PAGE_SHIFT) <= 512 /* MB */)
                cli->cl_max_rpcs_in_flight = 4;
-       } else {
+       else
                cli->cl_max_rpcs_in_flight = OBD_MAX_RIF_DEFAULT;
-       }
 
        spin_lock_init(&cli->cl_mod_rpcs_lock);
        spin_lock_init(&cli->cl_mod_rpcs_hist.oh_lock);

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 732595125d8aaee5fd3da0470c4c38bb4dccde02..aaff986f928728f8a06c1e1a529ae4b19b3cfc68 100644 (file)
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -2413,9 +2413,8 @@ static int lmv_read_page(struct obd_export *exp, struct md_op_data *op_data,
        if (rc)
                return rc;
 
-       if (unlikely(lsm)) {
+       if (unlikely(lsm))
                return lmv_read_striped_page(exp, op_data, cb_op, offset, ppage);
-       }
 
        tgt = lmv_find_target(lmv, &op_data->op_fid1);
        if (IS_ERR(tgt))
@@ -3107,9 +3106,8 @@ static int lmv_quotactl(struct obd_device *unused, struct obd_export *exp,
                return -EIO;
        }
 
-       if (oqctl->qc_cmd != Q_GETOQUOTA) {
+       if (oqctl->qc_cmd != Q_GETOQUOTA)
                return obd_quotactl(tgt->ltd_exp, oqctl);
-       }
 
        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
                int err;

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index 392b0e38a91ec060026a4c0aa2efba9bab195e61..9e06078c1e79a9447ddf715ae2adc5d61a1d99be 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -911,13 +911,13 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
                OBD_FAIL_TIMEOUT(OBD_FAIL_MDC_ENQUEUE_PAUSE, obd_timeout);
        }
 
-       if (it->it_op & IT_CREAT) {
+       if (it->it_op & IT_CREAT)
                /* XXX this belongs in ll_create_it */
-       } else if (it->it_op == IT_OPEN) {
+               ;
+       else if (it->it_op == IT_OPEN)
                LASSERT(!it_disposition(it, DISP_OPEN_CREATE));
-       } else {
+       else
                LASSERT(it->it_op & (IT_GETATTR | IT_LOOKUP | IT_LAYOUT));
-       }
 
        /* If we already have a matching lock, then cancel the new
         * one.  We have to set the data here instead of in

diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index abcf951208d21382af0354db966fd213b05db6f3..94c8ae5a106a09542e35b3eebd88093c3f0fc4e5 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -918,9 +918,8 @@ static unsigned long lu_htable_order(struct lu_device *top)
        cache_size = cache_size / 100 * lu_cache_percent *
                (PAGE_SIZE / 1024);
 
-       for (bits = 1; (1 << bits) < cache_size; ++bits) {
+       for (bits = 1; (1 << bits) < cache_size; ++bits)
                ;
-       }
        return clamp_t(typeof(bits), bits, LU_SITE_BITS_MIN, bits_max);
 }
 

diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index 77b4c5504689d7a61890077e77742b21d7c8ef47..d4768311cf92e55e6b1dc4f45df69705963a86ed 100644 (file)
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -1646,9 +1646,8 @@ static int echo_client_connect(const struct lu_env *env,
        struct lustre_handle conn = { 0 };
 
        rc = class_connect(&conn, src, cluuid);
-       if (rc == 0) {
+       if (rc == 0)
                *exp = class_conn2export(&conn);
-       }
 
        return rc;
 }

diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c
index c5ccf568313ae9383f0fd957b7e1fa7125f76dfc..33d769c625e79b5349db7334963d414b9244a989 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -1406,9 +1406,8 @@ static void osc_release_write_grant(struct client_obd *cli,
                                    struct brw_page *pga)
 {
        assert_spin_locked(&cli->cl_loi_list_lock);
-       if (!(pga->flag & OBD_BRW_FROM_GRANT)) {
+       if (!(pga->flag & OBD_BRW_FROM_GRANT))
                return;
-       }
 
        pga->flag &= ~OBD_BRW_FROM_GRANT;
        atomic_long_dec(&obd_dirty_pages);

diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index 93e172fe9ce45eea61119a9398a8eca92674fc7c..52cb1f0c9c94c1b840f89d85cd64a68d22844f4f 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -1182,17 +1182,15 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
        }
 
        /* Sanity checks for a reconnected import. */
-       if (!(imp->imp_replayable) != !(msg_flags & MSG_CONNECT_REPLAYABLE)) {
+       if (!(imp->imp_replayable) != !(msg_flags & MSG_CONNECT_REPLAYABLE))
                CERROR("imp_replayable flag does not match server after reconnect. We should LBUG right here.\n");
-       }
 
        if (lustre_msg_get_last_committed(request->rq_repmsg) > 0 &&
            lustre_msg_get_last_committed(request->rq_repmsg) <
-           aa->pcaa_peer_committed) {
+           aa->pcaa_peer_committed)
                CERROR("%s went back in time (transno %lld was previously committed, server now claims %lld)!  See https://bugzilla.lustre.org/show_bug.cgi?id=9646\n",
                       obd2cli_tgt(imp->imp_obd), aa->pcaa_peer_committed,
                       lustre_msg_get_last_committed(request->rq_repmsg));
-       }
 
 finish:
        ptlrpc_prepare_replay(imp);
@@ -1437,20 +1435,17 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
                rc = 0;
        }
 
-       if (imp->imp_state == LUSTRE_IMP_REPLAY_LOCKS) {
+       if (imp->imp_state == LUSTRE_IMP_REPLAY_LOCKS)
                if (atomic_read(&imp->imp_replay_inflight) == 0) {
                        IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY_WAIT);
                        rc = signal_completed_replay(imp);
                        if (rc)
                                goto out;
                }
-       }
 
-       if (imp->imp_state == LUSTRE_IMP_REPLAY_WAIT) {
-               if (atomic_read(&imp->imp_replay_inflight) == 0) {
+       if (imp->imp_state == LUSTRE_IMP_REPLAY_WAIT)
+               if (atomic_read(&imp->imp_replay_inflight) == 0)
                        IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
-               }
-       }
 
        if (imp->imp_state == LUSTRE_IMP_RECOVER) {
                CDEBUG(D_HA, "reconnected to %s@%s\n",