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

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index 8d07cda..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
@@ -135,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 */
@@ -147,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 */
@@ -304,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);
 
@@ -354,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,