Revert "LU-5275 lprocfs: remove last of non seq data structs and functions."

[fs/lustre-release.git] / lustre / ofd / ofd_internal.h

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index 5195dbc..92894cb 100644 (file)
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -42,13 +42,9 @@
 #include <dt_object.h>
 #include <md_object.h>
 #include <lustre_fid.h>
-#include <obd_ost.h>
 #include <lustre_capa.h>
 
 #define OFD_INIT_OBJID 0
-#define OFD_ROCOMPAT_SUPP (0)
-#define OFD_INCOMPAT_SUPP (OBD_INCOMPAT_GROUPS | OBD_INCOMPAT_OST | \
-                          OBD_INCOMPAT_COMMON_LR)
 #define OFD_PRECREATE_BATCH_DEFAULT (OBJ_SUBDIR_COUNT * 4)
 
 /* on small filesystems we should not precreate too many objects in
@@ -62,15 +58,15 @@
 
 /* per-client-per-object persistent state (LRU) */
 struct ofd_mod_data {
-       cfs_list_t      fmd_list;        /* linked to fed_mod_list */
-       struct lu_fid   fmd_fid;         /* FID being written to */
-       __u64           fmd_mactime_xid; /* xid highest {m,a,c}time setattr */
-       cfs_time_t      fmd_expire;      /* time when the fmd should expire */
-       int             fmd_refcount;    /* reference counter - list holds 1 */
+       struct list_head fmd_list;        /* linked to fed_mod_list */
+       struct lu_fid    fmd_fid;         /* FID being written to */
+       __u64            fmd_mactime_xid; /* xid highest {m,a,c}time setattr */
+       cfs_time_t       fmd_expire;      /* time when the fmd should expire */
+       int              fmd_refcount;    /* reference counter - list holds 1 */
 };
 
 #define OFD_FMD_MAX_NUM_DEFAULT 128
-#define OFD_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * HZ)
+#define OFD_FMD_MAX_AGE_DEFAULT msecs_to_jiffies((obd_timeout+10)*MSEC_PER_SEC)
 
 #define OFD_SOFT_SYNC_LIMIT_DEFAULT 16
 
@@ -109,7 +105,7 @@ static inline void ofd_counter_incr(struct obd_export *exp, int opcode,
 }
 
 struct ofd_seq {
-       cfs_list_t              os_list;
+       struct list_head        os_list;
        struct ost_id           os_oi;
        spinlock_t              os_last_oid_lock;
        struct mutex            os_create_lock;
@@ -134,7 +130,7 @@ struct ofd_device {
        __u64                    ofd_inconsistency_self_detected;
        __u64                    ofd_inconsistency_self_repaired;
 
-       cfs_list_t              ofd_seq_list;
+       struct list_head        ofd_seq_list;
        rwlock_t                ofd_seq_list_lock;
        int                     ofd_seq_count;
        int                     ofd_precreate_batch;
@@ -407,13 +403,9 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
 
 /* lproc_ofd.c */
 #ifdef LPROCFS
-void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars);
+extern struct lprocfs_seq_vars lprocfs_ofd_obd_vars[];
 void ofd_stats_counter_init(struct lprocfs_stats *stats);
 #else
-static void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars)
-{
-       memset(lvars, 0, sizeof(*lvars));
-}
 static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {}
 #endif
 
@@ -421,10 +413,6 @@ static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {}
 struct ofd_object *ofd_object_find(const struct lu_env *env,
                                   struct ofd_device *ofd,
                                   const struct lu_fid *fid);
-struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
-                                            struct ofd_device *ofd,
-                                            const struct lu_fid *fid,
-                                            struct lu_attr *attr);
 int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo);
 int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
                          obd_id id, struct ofd_seq *oseq, int nr, int sync);
@@ -500,7 +488,7 @@ static inline int ofd_grant_prohibit(struct obd_export *exp,
 
 void ofd_grant_sanity_check(struct obd_device *obd, const char *func);
 long ofd_grant_connect(const struct lu_env *env, struct obd_export *exp,
-                      obd_size want, bool conservative);
+                      obd_size want, bool new_conn);
 void ofd_grant_discard(struct obd_export *exp);
 void ofd_grant_prepare_read(const struct lu_env *env, struct obd_export *exp,
                            struct obdo *oa);
@@ -628,12 +616,4 @@ static inline void ofd_prepare_fidea(struct filter_fid *ff,
        ff->ff_parent.f_ver = cpu_to_le32(oa->o_stripe_idx);
 }
 
-/* niobuf_remote has no rnb_ prefix in master */
-#define rnb_offset offset
-#define rnb_flags  flags
-#define rnb_len    len
-/* the same for niobuf_local */
-#define lnb_flags flags
-#define lnb_rc    rc
-
 #endif /* _OFD_INTERNAL_H */