LU-3963 libcfs: remove cfs_hash_long

[fs/lustre-release.git] / lustre / ptlrpc / gss / gss_pipefs.c

diff --git a/lustre/ptlrpc/gss/gss_pipefs.c b/lustre/ptlrpc/gss/gss_pipefs.c
index 13f852f..849632a 100644 (file)
--- a/lustre/ptlrpc/gss/gss_pipefs.c
+++ b/lustre/ptlrpc/gss/gss_pipefs.c
@@ -141,19 +141,19 @@ void ctx_enhash_pf(struct ptlrpc_cli_ctx *ctx, cfs_hlist_head_t *hash)
 static
 void ctx_unhash_pf(struct ptlrpc_cli_ctx *ctx, cfs_hlist_head_t *freelist)
 {
-        LASSERT_SPIN_LOCKED(&ctx->cc_sec->ps_lock);
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount) > 0);
+       LASSERT(spin_is_locked(&ctx->cc_sec->ps_lock));
+       LASSERT(cfs_atomic_read(&ctx->cc_refcount) > 0);
        LASSERT(test_bit(PTLRPC_CTX_CACHED_BIT, &ctx->cc_flags));
-        LASSERT(!cfs_hlist_unhashed(&ctx->cc_cache));
+       LASSERT(!cfs_hlist_unhashed(&ctx->cc_cache));
 
        clear_bit(PTLRPC_CTX_CACHED_BIT, &ctx->cc_flags);
 
-        if (cfs_atomic_dec_and_test(&ctx->cc_refcount)) {
-                __cfs_hlist_del(&ctx->cc_cache);
-                cfs_hlist_add_head(&ctx->cc_cache, freelist);
-        } else {
-                cfs_hlist_del_init(&ctx->cc_cache);
-        }
+       if (cfs_atomic_dec_and_test(&ctx->cc_refcount)) {
+               __cfs_hlist_del(&ctx->cc_cache);
+               cfs_hlist_add_head(&ctx->cc_cache, freelist);
+       } else {
+               cfs_hlist_del_init(&ctx->cc_cache);
+       }
 }
 
 /*
@@ -425,14 +425,14 @@ struct ptlrpc_cli_ctx * gss_sec_lookup_ctx_pf(struct ptlrpc_sec *sec,
         struct ptlrpc_cli_ctx  *ctx = NULL, *new = NULL;
         cfs_hlist_head_t       *hash_head;
         cfs_hlist_node_t       *pos, *next;
-        CFS_HLIST_HEAD(freelist);
-        unsigned int            hash, gc = 0, found = 0;
-        ENTRY;
+       CFS_HLIST_HEAD(freelist);
+       unsigned int            hash, gc = 0, found = 0;
+       ENTRY;
 
-        cfs_might_sleep();
+       might_sleep();
 
-        gsec = container_of(sec, struct gss_sec, gs_base);
-        gsec_pf = container_of(gsec, struct gss_sec_pipefs, gsp_base);
+       gsec = container_of(sec, struct gss_sec, gs_base);
+       gsec_pf = container_of(gsec, struct gss_sec_pipefs, gsp_base);
 
         hash = ctx_hash_index(gsec_pf->gsp_chash_size,
                               (__u64) vcred->vc_uid);
@@ -546,15 +546,15 @@ int gss_sec_flush_ctx_cache_pf(struct ptlrpc_sec *sec,
         struct gss_sec          *gsec;
         struct gss_sec_pipefs   *gsec_pf;
         struct ptlrpc_cli_ctx   *ctx;
-        cfs_hlist_node_t        *pos, *next;
-        CFS_HLIST_HEAD(freelist);
-        int i, busy = 0;
-        ENTRY;
+       cfs_hlist_node_t        *pos, *next;
+       CFS_HLIST_HEAD(freelist);
+       int i, busy = 0;
+       ENTRY;
 
-        might_sleep_if(grace);
+       might_sleep_if(grace);
 
-        gsec = container_of(sec, struct gss_sec, gs_base);
-        gsec_pf = container_of(gsec, struct gss_sec_pipefs, gsp_base);
+       gsec = container_of(sec, struct gss_sec, gs_base);
+       gsec_pf = container_of(gsec, struct gss_sec_pipefs, gsp_base);
 
        spin_lock(&sec->ps_lock);
         for (i = 0; i < gsec_pf->gsp_chash_size; i++) {
@@ -731,17 +731,17 @@ void gss_release_msg(struct gss_upcall_msg *gmsg)
 static
 void gss_unhash_msg_nolock(struct gss_upcall_msg *gmsg)
 {
-        __u32 idx = gmsg->gum_mechidx;
+       __u32 idx = gmsg->gum_mechidx;
 
-        LASSERT(idx < MECH_MAX);
-        LASSERT_SPIN_LOCKED(&upcall_locks[idx]);
+       LASSERT(idx < MECH_MAX);
+       LASSERT(spin_is_locked(&upcall_locks[idx]));
 
-        if (cfs_list_empty(&gmsg->gum_list))
-                return;
+       if (cfs_list_empty(&gmsg->gum_list))
+               return;
 
-        cfs_list_del_init(&gmsg->gum_list);
-        LASSERT(cfs_atomic_read(&gmsg->gum_refcount) > 1);
-        cfs_atomic_dec(&gmsg->gum_refcount);
+       cfs_list_del_init(&gmsg->gum_list);
+       LASSERT(cfs_atomic_read(&gmsg->gum_refcount) > 1);
+       cfs_atomic_dec(&gmsg->gum_refcount);
 }
 
 static
@@ -817,7 +817,7 @@ ssize_t gss_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,
 
         if (mlen > buflen)
                 mlen = buflen;
-        left = cfs_copy_to_user(dst, data, mlen);
+       left = copy_to_user(dst, data, mlen);
         if (left < 0) {
                 msg->errno = left;
                 RETURN(left);
@@ -848,7 +848,7 @@ ssize_t gss_pipe_downcall(struct file *filp, const char *src, size_t mlen)
         if (!buf)
                 RETURN(-ENOMEM);
 
-        if (cfs_copy_from_user(buf, src, mlen)) {
+       if (copy_from_user(buf, src, mlen)) {
                 CERROR("failed copy user space data\n");
                 GOTO(out_free, rc = -EFAULT);
         }
@@ -1041,17 +1041,17 @@ static struct rpc_pipe_ops gss_upcall_ops = {
 static
 int gss_ctx_refresh_pf(struct ptlrpc_cli_ctx *ctx)
 {
-        struct obd_import          *imp;
-        struct gss_sec             *gsec;
-        struct gss_upcall_msg      *gmsg;
-        int                         rc = 0;
-        ENTRY;
+       struct obd_import          *imp;
+       struct gss_sec             *gsec;
+       struct gss_upcall_msg      *gmsg;
+       int                         rc = 0;
+       ENTRY;
 
-        cfs_might_sleep();
+       might_sleep();
 
-        LASSERT(ctx->cc_sec);
-        LASSERT(ctx->cc_sec->ps_import);
-        LASSERT(ctx->cc_sec->ps_import->imp_obd);
+       LASSERT(ctx->cc_sec);
+       LASSERT(ctx->cc_sec->ps_import);
+       LASSERT(ctx->cc_sec->ps_import->imp_obd);
 
         imp = ctx->cc_sec->ps_import;
         if (!imp->imp_connection) {