Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / staging / lustre / lustre / ptlrpc / gss / gss_keyring.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c b/drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c
index bb571ae51054567c3d455b7b196dd552956d169e..188dbbfbd2f495c3aeee906f71ae51900abfef71 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c
@@ -524,7 +524,6 @@ void rvs_sec_install_root_ctx_kr(struct ptlrpc_sec *sec,
        struct gss_sec_keyring *gsec_kr = sec2gsec_keyring(sec);
        struct ptlrpc_cli_ctx  *ctx;
        cfs_time_t            now;
-       ENTRY;
 
        LASSERT(sec_is_reverse(sec));
 
@@ -569,11 +568,10 @@ struct ptlrpc_sec * gss_sec_create_kr(struct obd_import *imp,
                                      struct sptlrpc_flavor *sf)
 {
        struct gss_sec_keyring  *gsec_kr;
-       ENTRY;
 
        OBD_ALLOC(gsec_kr, sizeof(*gsec_kr));
        if (gsec_kr == NULL)
-               RETURN(NULL);
+               return NULL;
 
        INIT_HLIST_HEAD(&gsec_kr->gsk_clist);
        gsec_kr->gsk_root_ctx = NULL;
@@ -592,11 +590,11 @@ struct ptlrpc_sec * gss_sec_create_kr(struct obd_import *imp,
                goto err_free;
        }
 
-       RETURN(&gsec_kr->gsk_base.gs_base);
+       return &gsec_kr->gsk_base.gs_base;
 
 err_free:
        OBD_FREE(gsec_kr, sizeof(*gsec_kr));
-       RETURN(NULL);
+       return NULL;
 }
 
 static
@@ -683,7 +681,6 @@ struct ptlrpc_cli_ctx * gss_sec_lookup_ctx_kr(struct ptlrpc_sec *sec,
        char                *coinfo;
        int                   coinfo_size;
        char                *co_flags = "";
-       ENTRY;
 
        LASSERT(imp != NULL);
 
@@ -697,7 +694,7 @@ struct ptlrpc_cli_ctx * gss_sec_lookup_ctx_kr(struct ptlrpc_sec *sec,
                 * always succeed.
                 */
                if (ctx || sec_is_reverse(sec))
-                       RETURN(ctx);
+                       return ctx;
        }
 
        LASSERT(create != 0);
@@ -821,7 +818,7 @@ struct ptlrpc_cli_ctx * gss_sec_lookup_ctx_kr(struct ptlrpc_sec *sec,
 out:
        if (is_root)
                mutex_unlock(&gsec_kr->gsk_root_uc_lock);
-       RETURN(ctx);
+       return ctx;
 }
 
 static
@@ -891,7 +888,6 @@ void flush_spec_ctx_cache_kr(struct ptlrpc_sec *sec,
        struct hlist_head       freelist = HLIST_HEAD_INIT;
        struct hlist_node      *next;
        struct ptlrpc_cli_ctx  *ctx;
-       ENTRY;
 
        gsec_kr = sec2gsec_keyring(sec);
 
@@ -930,15 +926,12 @@ void flush_spec_ctx_cache_kr(struct ptlrpc_sec *sec,
        spin_unlock(&sec->ps_lock);
 
        dispose_ctx_list_kr(&freelist);
-       EXIT;
 }
 
 static
 int gss_sec_flush_ctx_cache_kr(struct ptlrpc_sec *sec,
                               uid_t uid, int grace, int force)
 {
-       ENTRY;
-
        CDEBUG(D_SEC, "sec %p(%d, nctx %d), uid %d, grace %d, force %d\n",
               sec, atomic_read(&sec->ps_refcount),
               atomic_read(&sec->ps_nctx),
@@ -949,7 +942,7 @@ int gss_sec_flush_ctx_cache_kr(struct ptlrpc_sec *sec,
        else
                flush_spec_ctx_cache_kr(sec, uid, grace, force);
 
-       RETURN(0);
+       return 0;
 }
 
 static
@@ -959,7 +952,6 @@ void gss_sec_gc_ctx_kr(struct ptlrpc_sec *sec)
        struct hlist_head       freelist = HLIST_HEAD_INIT;
        struct hlist_node      *next;
        struct ptlrpc_cli_ctx  *ctx;
-       ENTRY;
 
        CWARN("running gc\n");
 
@@ -981,8 +973,6 @@ void gss_sec_gc_ctx_kr(struct ptlrpc_sec *sec)
        spin_unlock(&sec->ps_lock);
 
        dispose_ctx_list_kr(&freelist);
-       EXIT;
-       return;
 }
 
 static
@@ -993,7 +983,6 @@ int gss_sec_display_kr(struct ptlrpc_sec *sec, struct seq_file *seq)
        struct ptlrpc_cli_ctx  *ctx;
        struct gss_cli_ctx     *gctx;
        time_t            now = cfs_time_current_sec();
-       ENTRY;
 
        spin_lock(&sec->ps_lock);
        hlist_for_each_entry_safe(ctx, next,
@@ -1032,7 +1021,7 @@ int gss_sec_display_kr(struct ptlrpc_sec *sec, struct seq_file *seq)
        }
        spin_unlock(&sec->ps_lock);
 
-       RETURN(0);
+       return 0;
 }
 
 /****************************************
@@ -1148,16 +1137,15 @@ static
 int gss_kt_instantiate(struct key *key, const void *data, size_t datalen)
 {
        int          rc;
-       ENTRY;
 
        if (data != NULL || datalen != 0) {
                CERROR("invalid: data %p, len %lu\n", data, (long)datalen);
-               RETURN(-EINVAL);
+               return -EINVAL;
        }
 
        if (key->payload.data != 0) {
                CERROR("key already have payload\n");
-               RETURN(-EINVAL);
+               return -EINVAL;
        }
 
        /* link the key to session keyring, so following context negotiation
@@ -1179,11 +1167,11 @@ int gss_kt_instantiate(struct key *key, const void *data, size_t datalen)
                CERROR("failed to link key %08x to keyring %08x: %d\n",
                       key->serial,
                       key_tgcred(current)->session_keyring->serial, rc);
-               RETURN(rc);
+               return rc;
        }
 
        CDEBUG(D_SEC, "key %p instantiated, ctx %p\n", key, key->payload.data);
-       RETURN(0);
+       return 0;
 }
 
 /*
@@ -1198,11 +1186,10 @@ int gss_kt_update(struct key *key, const void *data, size_t datalen)
        rawobj_t                 tmpobj = RAWOBJ_EMPTY;
        __u32               datalen32 = (__u32) datalen;
        int                   rc;
-       ENTRY;
 
        if (data == NULL || datalen == 0) {
                CWARN("invalid: data %p, len %lu\n", data, (long)datalen);
-               RETURN(-EINVAL);
+               return -EINVAL;
        }
 
        /* if upcall finished negotiation too fast (mostly likely because
@@ -1216,9 +1203,9 @@ int gss_kt_update(struct key *key, const void *data, size_t datalen)
 
                rc = key_validate(key);
                if (rc == 0)
-                       RETURN(-EAGAIN);
+                       return -EAGAIN;
                else
-                       RETURN(rc);
+                       return rc;
        }
 
        LASSERT(atomic_read(&ctx->cc_refcount) > 0);
@@ -1229,7 +1216,7 @@ int gss_kt_update(struct key *key, const void *data, size_t datalen)
        /* don't proceed if already refreshed */
        if (cli_ctx_is_refreshed(ctx)) {
                CWARN("ctx already done refresh\n");
-               RETURN(0);
+               return 0;
        }
 
        sptlrpc_cli_ctx_get(ctx);
@@ -1304,7 +1291,7 @@ out:
 
        /* let user space think it's a success */
        sptlrpc_cli_ctx_put(ctx, 1);
-       RETURN(0);
+       return 0;
 }
 
 static
@@ -1316,10 +1303,8 @@ int gss_kt_match(const struct key *key, const void *desc)
 static
 void gss_kt_destroy(struct key *key)
 {
-       ENTRY;
        LASSERT(key->payload.data == NULL);
        CDEBUG(D_SEC, "destroy key %p\n", key);
-       EXIT;
 }
 
 static