Revert "LU-1214 ptlrpc: start minimum service threads"

[fs/lustre-release.git] / lustre / osd-zfs / osd_internal.h

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index f14a003..c6166f2 100644 (file)
--- 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))
@@ -169,12 +170,6 @@ struct osd_thread_info {
 
        char                     oti_buf[64];
 
-       /** osd iterator context used for iterator session */
-       union {
-               struct osd_zap_it       oti_it_zap;
-               struct osd_it_quota     oti_it_quota;
-       };
-
        char                     oti_str[64];
        union {
                char             oti_key[MAXNAMELEN + 1];
@@ -190,7 +185,6 @@ struct osd_thread_info {
 
        struct lquota_id_info    oti_qi;
        struct lu_seq_range      oti_seq_range;
-       unsigned int             oti_it_inline:1;
 };
 
 extern struct lu_context_key osd_key;
@@ -286,6 +280,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 +405,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,
@@ -422,8 +420,9 @@ enum {
        LPROC_OSD_LAST,
 };
 
+extern struct kmem_cache *osd_zapit_cachep;
 /* osd_lproc.c */
-extern struct lprocfs_seq_vars lprocfs_osd_obd_vars[];
+extern struct lprocfs_vars lprocfs_osd_obd_vars[];
 
 int osd_procfs_init(struct osd_device *osd, const char *name);
 int osd_procfs_fini(struct osd_device *osd);