Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-6204 build: clean up kernel module metadata
[fs/lustre-release.git] / lustre / ptlrpc / gss / gss_cli_upcall.c
diff --git a/lustre/ptlrpc/gss/gss_cli_upcall.c b/lustre/ptlrpc/gss/gss_cli_upcall.c
index c5d7348..765082d 100644 (file)
--- a/lustre/ptlrpc/gss/gss_cli_upcall.c
+++ b/lustre/ptlrpc/gss/gss_cli_upcall.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,16 +39,12 @@
  */
 
 #define DEBUG_SUBSYSTEM S_SEC
-#ifdef __KERNEL__
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/dcache.h>
 #include <linux/fs.h>
 #include <linux/mutex.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd.h>
 #include <obd_class.h>
@@ -135,7 +131,7 @@ int ctx_init_pack_request(struct obd_import *imp,
         /* 4. now the token */
         LASSERT(size >= (sizeof(__u32) + token_size));
         *p++ = cpu_to_le32(((__u32) token_size));
-        if (cfs_copy_from_user(p, token, token_size)) {
+       if (copy_from_user(p, token, token_size)) {
                 CERROR("can't copy token\n");
                 return -EFAULT;
         }
@@ -179,43 +175,43 @@ int ctx_init_parse_reply(struct lustre_msg *msg, int swabbed,
         status = 0;
         effective = 0;
 
-        if (cfs_copy_to_user(outbuf, &status, 4))
-                return -EFAULT;
-        outbuf += 4;
-        if (cfs_copy_to_user(outbuf, &ghdr->gh_major, 4))
-                return -EFAULT;
-        outbuf += 4;
-        if (cfs_copy_to_user(outbuf, &ghdr->gh_minor, 4))
-                return -EFAULT;
-        outbuf += 4;
-        if (cfs_copy_to_user(outbuf, &ghdr->gh_seqwin, 4))
-                return -EFAULT;
-        outbuf += 4;
-        effective += 4 * 4;
-
-        /* handle */
-        obj_len = ghdr->gh_handle.len;
-        round_len = (obj_len + 3) & ~ 3;
-        if (cfs_copy_to_user(outbuf, &obj_len, 4))
-                return -EFAULT;
-        outbuf += 4;
-        if (cfs_copy_to_user(outbuf, (char *) ghdr->gh_handle.data, round_len))
-                return -EFAULT;
-        outbuf += round_len;
-        effective += 4 + round_len;
-
-        /* out token */
-        obj_len = msg->lm_buflens[2];
-        round_len = (obj_len + 3) & ~ 3;
-        if (cfs_copy_to_user(outbuf, &obj_len, 4))
-                return -EFAULT;
-        outbuf += 4;
-        if (cfs_copy_to_user(outbuf, lustre_msg_buf(msg, 2, 0), round_len))
-                return -EFAULT;
-        outbuf += round_len;
-        effective += 4 + round_len;
-
-        return effective;
+       if (copy_to_user(outbuf, &status, 4))
+               return -EFAULT;
+       outbuf += 4;
+       if (copy_to_user(outbuf, &ghdr->gh_major, 4))
+               return -EFAULT;
+       outbuf += 4;
+       if (copy_to_user(outbuf, &ghdr->gh_minor, 4))
+               return -EFAULT;
+       outbuf += 4;
+       if (copy_to_user(outbuf, &ghdr->gh_seqwin, 4))
+               return -EFAULT;
+       outbuf += 4;
+       effective += 4 * 4;
+
+       /* handle */
+       obj_len = ghdr->gh_handle.len;
+       round_len = (obj_len + 3) & ~3;
+       if (copy_to_user(outbuf, &obj_len, 4))
+               return -EFAULT;
+       outbuf += 4;
+       if (copy_to_user(outbuf, (char *) ghdr->gh_handle.data, round_len))
+               return -EFAULT;
+       outbuf += round_len;
+       effective += 4 + round_len;
+
+       /* out token */
+       obj_len = msg->lm_buflens[2];
+       round_len = (obj_len + 3) & ~3;
+       if (copy_to_user(outbuf, &obj_len, 4))
+               return -EFAULT;
+       outbuf += 4;
+       if (copy_to_user(outbuf, lustre_msg_buf(msg, 2, 0), round_len))
+               return -EFAULT;
+       outbuf += round_len;
+       effective += 4 + round_len;
+
+       return effective;
 }
 
 /* XXX move to where lgssd could see */
@@ -249,7 +245,7 @@ int gss_do_ctx_init_rpc(__user char *buffer, unsigned long count)
                        "version\n", count, (unsigned long) sizeof(param));
                 RETURN(-EINVAL);
         }
-        if (cfs_copy_from_user(&param, buffer, sizeof(param))) {
+       if (copy_from_user(&param, buffer, sizeof(param))) {
                 CERROR("failed copy data from lgssd\n");
                 RETURN(-EFAULT);
         }
@@ -286,7 +282,9 @@ int gss_do_ctx_init_rpc(__user char *buffer, unsigned long count)
 
        if (strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) &&
            strcmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME) &&
-           strcmp(obd->obd_type->typ_name, LUSTRE_MGC_NAME)) {
+           strcmp(obd->obd_type->typ_name, LUSTRE_MGC_NAME) &&
+           strcmp(obd->obd_type->typ_name, LUSTRE_LWP_NAME) &&
+           strcmp(obd->obd_type->typ_name, LUSTRE_OSP_NAME)) {
                CERROR("obd %s is not a client device\n", obdname);
                spin_unlock(&obd->obd_dev_lock);
                RETURN(-EINVAL);
@@ -365,7 +363,7 @@ int gss_do_ctx_init_rpc(__user char *buffer, unsigned long count)
         param.reply_length = lsize;
 
 out_copy:
-        if (cfs_copy_to_user(buffer, &param, sizeof(param)))
+       if (copy_to_user(buffer, &param, sizeof(param)))
                 rc = -EFAULT;
         else
                 rc = 0;
@@ -377,29 +375,29 @@ out_copy:
 
 int gss_do_ctx_fini_rpc(struct gss_cli_ctx *gctx)
 {
-        struct ptlrpc_cli_ctx   *ctx = &gctx->gc_base;
-        struct obd_import       *imp = ctx->cc_sec->ps_import;
-        struct ptlrpc_request   *req;
-        struct ptlrpc_user_desc *pud;
-        int                      rc;
-        ENTRY;
-
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount) > 0);
-
-        if (cli_ctx_is_error(ctx) || !cli_ctx_is_uptodate(ctx)) {
-                CDEBUG(D_SEC, "ctx %p(%u->%s) not uptodate, "
-                       "don't send destroy rpc\n", ctx,
-                       ctx->cc_vcred.vc_uid, sec2target_str(ctx->cc_sec));
-                RETURN(0);
-        }
+       struct ptlrpc_cli_ctx   *ctx = &gctx->gc_base;
+       struct obd_import       *imp = ctx->cc_sec->ps_import;
+       struct ptlrpc_request   *req;
+       struct ptlrpc_user_desc *pud;
+       int                      rc;
+       ENTRY;
+
+       LASSERT(atomic_read(&ctx->cc_refcount) > 0);
+
+       if (cli_ctx_is_error(ctx) || !cli_ctx_is_uptodate(ctx)) {
+               CDEBUG(D_SEC, "ctx %p(%u->%s) not uptodate, "
+                      "don't send destroy rpc\n", ctx,
+                      ctx->cc_vcred.vc_uid, sec2target_str(ctx->cc_sec));
+               RETURN(0);
+       }
 
-        cfs_might_sleep();
+       might_sleep();
 
-        CWARN("%s ctx %p idx "LPX64" (%u->%s)\n",
-              sec_is_reverse(ctx->cc_sec) ?
-              "server finishing reverse" : "client finishing forward",
-              ctx, gss_handle_to_u64(&gctx->gc_handle),
-              ctx->cc_vcred.vc_uid, sec2target_str(ctx->cc_sec));
+       CWARN("%s ctx %p idx "LPX64" (%u->%s)\n",
+             sec_is_reverse(ctx->cc_sec) ?
+             "server finishing reverse" : "client finishing forward",
+             ctx, gss_handle_to_u64(&gctx->gc_handle),
+             ctx->cc_vcred.vc_uid, sec2target_str(ctx->cc_sec));
 
         gctx->gc_proc = PTLRPC_GSS_PROC_DESTROY;
 
@@ -446,6 +444,6 @@ int __init gss_init_cli_upcall(void)
         return 0;
 }
 
-void __exit gss_exit_cli_upcall(void)
+void gss_exit_cli_upcall(void)
 {
 }
Lustre primary development and releases