Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12137 osd-ldiskfs: create locked and unlocked versions of osd lookup code
[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
6cb4028
..
23506f8
100644
(file)
--- a/
lustre/ptlrpc/gss/gss_generic_token.c
+++ b/
lustre/ptlrpc/gss/gss_generic_token.c
@@
-1,9
+1,10
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* Modifications for Lustre
* Modifications for Lustre
- * Copyright 2004 - 2006, Cluster File Systems, 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>
*/
* Author: Eric Mei <ericm@clusterfs.com>
*/
@@
-40,22
+41,15
@@
* PERFORMANCE OF THIS SOFTWARE.
*/
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_SEC
#define DEBUG_SUBSYSTEM S_SEC
-#ifdef __KERNEL__
#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
-#else
-#include <liblustre.h>
-#endif
+#include <linux/mutex.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#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>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_sec.h>
@@
-281,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);
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);
if (!mech->data)
return (G_BUFFER_ALLOC);
memcpy(mech->data, buf, mech->len);