X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fofd%2Fofd_internal.h;h=f3f4de7c8c890f15fcb767efafe1c19334992c5f;hp=ca2f8f78021bbca6348544b75be12308a5cc03da;hb=a21ce928aa641cbfacb9dde74e4be1cd1b658fb0;hpb=48457868a02ae5a0407f304c9028f7e80e7fb574

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index ca2f8f7..f3f4de7 100644
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef _OFD_INTERNAL_H
@@ -61,7 +60,9 @@
 
 /* request stats */
 enum {
-	LPROC_OFD_STATS_READ = 0,
+	LPROC_OFD_STATS_READ_BYTES = 0,
+	LPROC_OFD_STATS_WRITE_BYTES,
+	LPROC_OFD_STATS_READ,
 	LPROC_OFD_STATS_WRITE,
 	LPROC_OFD_STATS_GETATTR,
 	LPROC_OFD_STATS_SETATTR,
@@ -133,9 +134,6 @@ struct ofd_device {
 
 	/* preferred BRW size, decided by storage type and capability */
 	__u32			 ofd_brw_size;
-	/* checksum types supported on this node */
-	enum cksum_types	 ofd_cksum_types_supported;
-
 	spinlock_t		 ofd_flags_lock;
 	unsigned long		 ofd_raid_degraded:1,
 				 /* sync journal on writes */
@@ -145,16 +143,14 @@ struct ofd_device {
 				 ofd_record_fid_accessed:1,
 				 ofd_lfsck_verify_pfid:1,
 				 ofd_no_precreate:1,
-				 ofd_skip_lfsck:1,
-				 /* Whether to enforce T10PI checksum of RPC */
-				 ofd_checksum_t10pi_enforce:1;
+				 ofd_skip_lfsck:1;
 	struct seq_server_site	 ofd_seq_site;
 	/* the limit of SOFT_SYNC RPCs that will trigger a soft sync */
 	unsigned int		 ofd_soft_sync_limit;
 	/* Protect ::ofd_lastid_rebuilding */
 	struct rw_semaphore	 ofd_lastid_rwsem;
 	__u64			 ofd_lastid_gen;
-	struct ptlrpc_thread	 ofd_inconsistency_thread;
+	struct task_struct	*ofd_inconsistency_task;
 	struct list_head	 ofd_inconsistency_list;
 	spinlock_t		 ofd_inconsistency_lock;
 	/* Backwards compatibility */
@@ -166,7 +162,7 @@ struct ofd_device {
 
 static inline struct ofd_device *ofd_dev(struct lu_device *d)
 {
-	return container_of0(d, struct ofd_device, ofd_dt_dev.dd_lu_dev);
+	return container_of_safe(d, struct ofd_device, ofd_dt_dev.dd_lu_dev);
 }
 
 static inline struct obd_device *ofd_obd(struct ofd_device *ofd)
@@ -195,7 +191,7 @@ struct ofd_object {
 
 static inline struct ofd_object *ofd_obj(struct lu_object *o)
 {
-	return container_of0(o, struct ofd_object, ofo_obj.do_lu);
+	return container_of_safe(o, struct ofd_object, ofo_obj.do_lu);
 }
 
 static inline int ofd_object_exists(struct ofd_object *obj)
@@ -215,7 +211,7 @@ static inline struct dt_object *ofd_object_child(struct ofd_object *_obj)
 {
 	struct lu_object *lu = &(_obj)->ofo_obj.do_lu;
 
-	return container_of0(lu_object_next(lu), struct dt_object, do_lu);
+	return container_of(lu_object_next(lu), struct dt_object, do_lu);
 }
 
 static inline struct ofd_device *ofd_obj2dev(const struct ofd_object *fo)
@@ -302,7 +298,7 @@ void ofd_access_log_module_exit(void);
 struct ofd_access_log;
 struct ofd_access_log *ofd_access_log_create(const char *ofd_name, size_t size);
 void ofd_access_log_delete(struct ofd_access_log *oal);
-void ofd_access(struct ofd_device *m,
+void ofd_access(const struct lu_env *env, struct ofd_device *m,
 		const struct lu_fid *parent_fid, __u64 begin, __u64 end,
 		unsigned int size, unsigned int segment_count, int rw);
 
@@ -352,7 +348,8 @@ int ofd_preprw(const struct lu_env *env,int cmd, struct obd_export *exp,
 int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp,
 		 struct obdo *oa, int objcount, struct obd_ioobj *obj,
 		 struct niobuf_remote *rnb, int npages,
-		 struct niobuf_local *lnb, int old_rc);
+		 struct niobuf_local *lnb, int old_rc, int nob,
+		 ktime_t kstart);
 
 /* ofd_trans.c */
 struct thandle *ofd_trans_create(const struct lu_env *env,
@@ -368,9 +365,10 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
 /* lproc_ofd.c */
 int ofd_tunables_init(struct ofd_device *ofd);
 #ifdef CONFIG_PROC_FS
-void ofd_stats_counter_init(struct lprocfs_stats *stats);
+void ofd_stats_counter_init(struct lprocfs_stats *stats, unsigned int offset);
 #else
-static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {}
+static inline void ofd_stats_counter_init(struct lprocfs_stats *stats,
+					  unsigned int offset) {}
 #endif
 
 /* ofd_objects.c */