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-1866 lfsck: LFSCK for namespace consistency (2)
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_sec.h
diff --git
a/lustre/include/lustre_sec.h
b/lustre/include/lustre_sec.h
index
2d56780
..
d6fbd2f
100644
(file)
--- a/
lustre/include/lustre_sec.h
+++ b/
lustre/include/lustre_sec.h
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-28,6
+26,8
@@
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-514,7
+514,7
@@
struct ptlrpc_cli_ctx {
unsigned int cc_early_expire:1;
unsigned long cc_flags;
struct vfs_cred cc_vcred;
unsigned int cc_early_expire:1;
unsigned long cc_flags;
struct vfs_cred cc_vcred;
-
cfs_spinlock_t
cc_lock;
+
spinlock_t
cc_lock;
cfs_list_t cc_req_list; /* waiting reqs linked here */
cfs_list_t cc_gc_chain; /* linked to gc chain */
};
cfs_list_t cc_req_list; /* waiting reqs linked here */
cfs_list_t cc_gc_chain; /* linked to gc chain */
};
@@
-829,7
+829,7
@@
struct ptlrpc_sec {
unsigned int ps_dying:1;
/** owning import */
struct obd_import *ps_import;
unsigned int ps_dying:1;
/** owning import */
struct obd_import *ps_import;
-
cfs_spinlock_t
ps_lock;
+
spinlock_t
ps_lock;
/*
* garbage collection
/*
* garbage collection
@@
-885,13
+885,6
@@
enum sptlrpc_bulk_hash_alg {
BULK_HASH_ALG_MAX
};
BULK_HASH_ALG_MAX
};
-struct sptlrpc_hash_type {
- char *sht_name;
- char *sht_tfm_name;
- unsigned int sht_size;
-};
-
-const struct sptlrpc_hash_type *sptlrpc_get_hash_type(__u8 hash_alg);
const char * sptlrpc_get_hash_name(__u8 hash_alg);
__u8 sptlrpc_get_hash_alg(const char *algname);
const char * sptlrpc_get_hash_name(__u8 hash_alg);
__u8 sptlrpc_get_hash_alg(const char *algname);