LU-8468 kernel: kernel update RHEL7.2 [3.10.0-327.28.2.el7]

[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 b36c99a..67e7480 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, 2012, Intel Corporation.
+ * 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>
@@ -222,19 +218,19 @@ int ctx_init_parse_reply(struct lustre_msg *msg, int swabbed,
 struct lgssd_ioctl_param {
         int             version;        /* in   */
         int             secid;          /* in   */
-        char           *uuid;           /* in   */
+       char __user    *uuid;           /* in   */
         int             lustre_svc;     /* in   */
         uid_t           uid;            /* in   */
         gid_t           gid;            /* in   */
         long            send_token_size;/* in   */
-        char           *send_token;     /* in   */
+       char __user    *send_token;     /* in   */
         long            reply_buf_size; /* in   */
-        char           *reply_buf;      /* in   */
+       char __user    *reply_buf;      /* in   */
         long            status;         /* out  */
         long            reply_length;   /* out  */
 };
 
-int gss_do_ctx_init_rpc(__user char *buffer, unsigned long count)
+int gss_do_ctx_init_rpc(char __user *buffer, unsigned long count)
 {
         struct obd_import        *imp;
         struct ptlrpc_request    *req;
@@ -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);
@@ -377,14 +375,14 @@ 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;
+       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);
+       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, "
@@ -412,10 +410,8 @@ int gss_do_ctx_fini_rpc(struct gss_cli_ctx *gctx)
 
         rc = ptlrpc_request_bufs_pack(req, LUSTRE_OBD_VERSION, SEC_CTX_FINI,
                                       NULL, ctx);
-        if (rc) {
-                ptlrpc_request_free(req);
-                GOTO(out_ref, rc);
-        }
+       if (rc)
+               GOTO(out_ref, rc);
 
         /* fix the user desc */
         if (req->rq_pack_udesc) {
@@ -446,6 +442,6 @@ int __init gss_init_cli_upcall(void)
         return 0;
 }
 
-void __exit gss_exit_cli_upcall(void)
+void gss_exit_cli_upcall(void)
 {
 }