LU-11385 odbclass: Handle gracefully if nsproxy is NULL

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

diff --git a/lustre/ptlrpc/gss/gss_generic_token.c b/lustre/ptlrpc/gss/gss_generic_token.c
index 9c23852..23506f8 100644 (file)
--- a/lustre/ptlrpc/gss/gss_generic_token.c
+++ b/lustre/ptlrpc/gss/gss_generic_token.c
@@ -1,9 +1,9 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * Modifications for Lustre
  *
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Copyright (c) 2011, Intel Corporation.
  *
  * Author: Eric Mei <ericm@clusterfs.com>
  */
@@ -41,23 +41,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_SEC
-#ifdef __KERNEL__
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#else
-#include <liblustre.h>
-#endif
 
 #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>
@@ -283,7 +275,7 @@ __u32 g_get_mech_oid(rawobj_t *mech, rawobj_t *in_buf)
 
         if ((len -= mech->len) < 0)
                 return (G_BAD_TOK_HEADER);
-        OBD_ALLOC(mech->data, mech->len);
+        OBD_ALLOC_LARGE(mech->data, mech->len);
         if (!mech->data) 
                 return (G_BUFFER_ALLOC);
         memcpy(mech->data, buf, mech->len);