Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[~andy/linux] / drivers / staging / lustre / lustre / mgc / mgc_request.c

diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index b32382088e96cb654f8adf41f554126ac5e14360..3bdbb94e020fbeeaed169cfae69bc532c7f18594 100644 (file)
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -70,7 +70,7 @@ static int mgc_name2resid(char *name, int len, struct ldlm_res_id *res_id,
        memset(res_id, 0, sizeof(*res_id));
        res_id->name[0] = cpu_to_le64(resname);
        /* XXX: unfortunately, sptlprc and config llog share one lock */
-       switch(type) {
+       switch (type) {
        case CONFIG_T_CONFIG:
        case CONFIG_T_SPTLRPC:
                resname = 0;
@@ -1090,18 +1090,18 @@ int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp,
                        return -EINVAL;
 
                rc = mgc_fs_setup(exp->exp_obd, sb);
-               if (rc) {
+               if (rc)
                        CERROR("set_fs got %d\n", rc);
-               }
+
                return rc;
        }
        if (KEY_IS(KEY_CLEAR_FS)) {
                if (vallen != 0)
                        return -EINVAL;
                rc = mgc_fs_cleanup(exp->exp_obd);
-               if (rc) {
+               if (rc)
                        CERROR("clear_fs got %d\n", rc);
-               }
+
                return rc;
        }
        if (KEY_IS(KEY_SET_INFO)) {
@@ -1800,7 +1800,7 @@ static int mgc_process_config(struct obd_device *obd, obd_count len, void *buf)
        char *logname;
        int rc = 0;
 
-       switch(lcfg->lcfg_command) {
+       switch (lcfg->lcfg_command) {
        case LCFG_LOV_ADD_OBD: {
                /* Overloading this cfg command: register a new target */
                struct mgs_target_info *mti;
@@ -1895,9 +1895,9 @@ struct obd_ops mgc_obd_ops = {
        .o_del_conn     = client_import_del_conn,
        .o_connect      = client_connect_import,
        .o_disconnect   = client_disconnect_export,
-       //.o_enqueue      = mgc_enqueue,
+       /* .o_enqueue      = mgc_enqueue, */
        .o_cancel       = mgc_cancel,
-       //.o_iocontrol    = mgc_iocontrol,
+       /* .o_iocontrol    = mgc_iocontrol, */
        .o_set_info_async = mgc_set_info_async,
        .o_get_info       = mgc_get_info,
        .o_import_event = mgc_import_event,