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-12559 ptlrpc: Hold imp lock for idle reconnect
[fs/lustre-release.git]
/
lustre
/
include
/
obd_target.h
diff --git
a/lustre/include/obd_target.h
b/lustre/include/obd_target.h
index
330d44f
..
79f29dd
100644
(file)
--- a/
lustre/include/obd_target.h
+++ b/
lustre/include/obd_target.h
@@
-14,11
+14,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
*/
@@
-26,7
+22,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/
@@
-46,6
+42,7
@@
struct obd_device_target {
struct lu_target *obt_lut;
__u64 obt_mount_count;
struct obd_job_stats obt_jobstats;
struct lu_target *obt_lut;
__u64 obt_mount_count;
struct obd_job_stats obt_jobstats;
+ struct nm_config_file *obt_nodemap_config_file;
};
#define OBJ_SUBDIR_COUNT 32 /* set to zero for no subdirs */
};
#define OBJ_SUBDIR_COUNT 32 /* set to zero for no subdirs */
@@
-53,18
+50,13
@@
struct obd_device_target {
struct filter_obd {
/* NB this field MUST be first */
struct obd_device_target fo_obt;
struct filter_obd {
/* NB this field MUST be first */
struct obd_device_target fo_obt;
-
- /* capability related */
- unsigned int fo_fl_oss_capa;
- struct list_head fo_capa_keys;
- struct hlist_head *fo_capa_hash;
};
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;
atomic_t eo_prep;
};
struct lustre_handle eo_nl_lock;
atomic_t eo_prep;
};