LU-11429 mdt: rename mdt_remote_permission

[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 4c6a33f..9ae9d8f 100644 (file)
--- a/lustre/ptlrpc/gss/gss_cli_upcall.c
+++ b/lustre/ptlrpc/gss/gss_cli_upcall.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -49,7 +45,6 @@
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
-#include <lustre/lustre_idl.h>
 #include <lustre_net.h>
 #include <lustre_import.h>
 #include <lustre_sec.h>
@@ -218,19 +213,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;
@@ -393,7 +388,7 @@ int gss_do_ctx_fini_rpc(struct gss_cli_ctx *gctx)
 
        might_sleep();
 
-       CWARN("%s ctx %p idx "LPX64" (%u->%s)\n",
+       CWARN("%s ctx %p idx %#llx (%u->%s)\n",
              sec_is_reverse(ctx->cc_sec) ?
              "server finishing reverse" : "client finishing forward",
              ctx, gss_handle_to_u64(&gctx->gc_handle),