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-6210 utils: Use C99 initializer in jt_obd_md_common()
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_handles.h
diff --git
a/lustre/include/lustre_handles.h
b/lustre/include/lustre_handles.h
index
5b6f30f
..
16917ca
100644
(file)
--- a/
lustre/include/lustre_handles.h
+++ b/
lustre/include/lustre_handles.h
@@
-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
*
* 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
*/
*
* 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) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012,
2014,
Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-42,20
+38,10
@@
* @{
*/
* @{
*/
-#if defined(__linux__)
-#include <linux/lustre_handles.h>
-#else
-#error Unsupported operating system.
-#endif
-
+#include <linux/rcupdate.h>
+#include <linux/spinlock.h>
#include <libcfs/libcfs.h>
#include <libcfs/libcfs.h>
-#ifndef __KERNEL__
-typedef struct {
- int foo;
-} cfs_rcu_head_t;
-#endif
-
struct portals_handle_ops {
void (*hop_addref)(void *object);
void (*hop_free)(void *object, int size);
struct portals_handle_ops {
void (*hop_addref)(void *object);
void (*hop_free)(void *object, int size);
@@
-79,12
+65,11
@@
struct portals_handle {
struct portals_handle_ops *h_ops;
/* newly added fields to handle the RCU issue. -jxiong */
struct portals_handle_ops *h_ops;
/* newly added fields to handle the RCU issue. -jxiong */
-
cfs_rcu_head_t
h_rcu;
+
struct rcu_head
h_rcu;
spinlock_t h_lock;
unsigned int h_size:31;
unsigned int h_in:1;
};
spinlock_t h_lock;
unsigned int h_size:31;
unsigned int h_in:1;
};
-#define RCU2HANDLE(rcu) container_of(rcu, struct portals_handle, h_rcu)
/* handles.c */
/* handles.c */
@@
-94,7
+79,7
@@
void class_handle_hash(struct portals_handle *,
void class_handle_unhash(struct portals_handle *);
void class_handle_hash_back(struct portals_handle *);
void *class_handle2object(__u64 cookie, const void *owner);
void class_handle_unhash(struct portals_handle *);
void class_handle_hash_back(struct portals_handle *);
void *class_handle2object(__u64 cookie, const void *owner);
-void class_handle_free_cb(
cfs_rcu_head_t *
);
+void class_handle_free_cb(
struct rcu_head *rcu
);
int class_handle_init(void);
void class_handle_cleanup(void);
int class_handle_init(void);
void class_handle_cleanup(void);