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-7421 utils: getparam_display() should reset popt
[fs/lustre-release.git]
/
lustre
/
include
/
obd_target.h
diff --git
a/lustre/include/obd_target.h
b/lustre/include/obd_target.h
index
0d7ea23
..
ed8ec98
100644
(file)
--- a/
lustre/include/obd_target.h
+++ b/
lustre/include/obd_target.h
@@
-26,7
+26,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) 2011, 201
2, Intel, Inc
.
+ * Copyright (c) 2011, 201
4, Intel Corporation
.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-48,36
+48,29
@@
struct obd_device_target {
struct obd_job_stats obt_jobstats;
};
struct obd_job_stats obt_jobstats;
};
-#define
FILTER
_SUBDIR_COUNT 32 /* set to zero for no subdirs */
+#define
OBJ
_SUBDIR_COUNT 32 /* set to zero for no subdirs */
struct filter_obd {
/* NB this field MUST be first */
struct filter_obd {
/* NB this field MUST be first */
- struct obd_device_target fo_obt;
- rwlock_t fo_sptlrpc_lock;
- struct sptlrpc_rule_set fo_sptlrpc_rset;
-
- /* capability related */
- unsigned int fo_fl_oss_capa;
- cfs_list_t fo_capa_keys;
- cfs_hlist_head_t *fo_capa_hash;
- int fo_sec_level;
+ struct obd_device_target fo_obt;
};
struct echo_obd {
struct obd_device_target eo_obt;
struct obdo eo_oa;
spinlock_t eo_lock;
};
struct echo_obd {
struct obd_device_target eo_obt;
struct obdo eo_oa;
spinlock_t eo_lock;
-
__u64
eo_lastino;
+
u64
eo_lastino;
struct lustre_handle eo_nl_lock;
struct lustre_handle eo_nl_lock;
-
cfs_atomic_t
eo_prep;
+
atomic_t
eo_prep;
};
struct ost_obd {
};
struct ost_obd {
- struct ptlrpc_service *ost_service;
- struct ptlrpc_service *ost_create_service;
- struct ptlrpc_service *ost_io_service;
- struct ptlrpc_service *ost_seq_service;
- struct mutex ost_health_mutex;
+ struct ptlrpc_service *ost_service;
+ struct ptlrpc_service *ost_create_service;
+ struct ptlrpc_service *ost_io_service;
+ struct ptlrpc_service *ost_seq_service;
+ struct ptlrpc_service *ost_out_service;
+ struct mutex ost_health_mutex;
};
#endif /* __OBD_TARGET_H */
};
#endif /* __OBD_TARGET_H */