X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_target.h;h=79f29dd374d868ea38c3215438b81ccbf49fc100;hb=e9472c54ac820c3a0db2318a6ef894c3971e6e0b;hp=cbe415cc023734a7b8ffd4e3763b78125a4ba519;hpb=4dd60f8e4d4ad0ce7a0c74d0063d396aae0223bb;p=fs%2Flustre-release.git

diff --git a/lustre/include/obd_target.h b/lustre/include/obd_target.h
index cbe415c..79f29dd 100644
--- 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
- * 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
  */
@@ -26,7 +22,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -46,28 +42,21 @@ struct obd_device_target {
 	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 */
 
 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;
-	__u64				eo_lastino;
+	u64				eo_lastino;
 	struct lustre_handle		eo_nl_lock;
 	atomic_t			eo_prep;
 };