X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_internal.h;h=47f9a2e1c4bdda33ca121f88fbe90412a13a5669;hb=refs%2Fchanges%2F99%2F13299%2F3;hp=f14a003db64187ba3344f120990c35132fe10c6f;hpb=a6f415ad648f2da0708612beba51f34c2594f5ec;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index f14a003..47f9a2e 100644
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -26,10 +26,8 @@
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- */
-/*
- * Copyright (c) 2012, 2013, Intel Corporation.
- * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -51,6 +49,9 @@
 #include <lustre_quota.h>
 
 #define _SPL_KMEM_H
+/* SPL redefines this but to the same value: ~0UL vs -1, but GCC complains.
+ * fixed in SPL master 52479ecf58fa89190e384edcf838fecccc786af5 */
+#undef SHRINK_STOP
 #include <sys/kstat.h>
 #define kmem_zalloc(a, b)	kzalloc(a, b)
 #define kmem_free(ptr, sz)	((void)(sz), kfree(ptr))
@@ -286,6 +287,10 @@ struct osd_device {
 	/* quota slave instance */
 	struct qsd_instance	*od_quota_slave;
 
+	struct brw_stats	od_brw_stats;
+	atomic_t		od_r_in_flight;
+	atomic_t		od_w_in_flight;
+
 	/* used to debug zerocopy logic: the fields track all
 	 * allocated, loaned and referenced buffers in use.
 	 * to be removed once the change is tested well. */
@@ -407,7 +412,7 @@ static inline char *osd_name(struct osd_device *osd)
 	return osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name;
 }
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 enum {
 	LPROC_OSD_READ_BYTES = 0,
 	LPROC_OSD_WRITE_BYTES = 1,