X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_target.h;h=ed8ec9813302c11b1b763437d84a6a9e5641045d;hb=ad21703f66c0d013d3cbd2d7f307715ef77864ff;hp=cef0bd17aa12fdd3813641d9037536a2689d1434;hpb=77eea1985bb1655e58c8b7df00703b4f08b58ec7;p=fs%2Flustre-release.git

diff --git a/lustre/include/obd_target.h b/lustre/include/obd_target.h
index cef0bd1..ed8ec98 100644
--- 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) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -52,22 +52,14 @@ struct obd_device_target {
 
 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;
 };
@@ -78,7 +70,6 @@ struct ost_obd {
 	struct ptlrpc_service	*ost_io_service;
 	struct ptlrpc_service	*ost_seq_service;
 	struct ptlrpc_service	*ost_out_service;
-	struct ptlrpc_service	*ost_idx_service;
 	struct mutex		 ost_health_mutex;
 };