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 10791a5..c6166f2 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -170,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];
@@ -191,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;
@@ -412,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,
@@ -427,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);