LU-1346 libcfs: replace libcfs wrappers with kernel API

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

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index c94a7a2..45b8e3d 100644 (file)
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -49,6 +49,7 @@
 #define OFD_INCOMPAT_SUPP (OBD_INCOMPAT_GROUPS | OBD_INCOMPAT_OST | \
                           OBD_INCOMPAT_COMMON_LR)
 #define OFD_MAX_GROUPS 256
+#define OFD_PRECREATE_BATCH_DEFAULT (FILTER_SUBDIR_COUNT * 4)
 
 /* Limit the returned fields marked valid to those that we actually might set */
 #define OFD_VALID_FLAGS (LA_TYPE | LA_MODE | LA_SIZE | LA_BLOCKS | \
@@ -72,6 +73,24 @@ enum {
        LPROC_OFD_LAST,
 };
 
+/* for job stats */
+enum {
+       LPROC_OFD_STATS_READ = 0,
+       LPROC_OFD_STATS_WRITE = 1,
+       LPROC_OFD_STATS_SETATTR = 2,
+       LPROC_OFD_STATS_PUNCH = 3,
+       LPROC_OFD_STATS_SYNC = 4,
+       LPROC_OFD_STATS_LAST,
+};
+
+static inline void ofd_counter_incr(struct obd_export *exp, int opcode,
+                                   char *jobid, long amount)
+{
+       if (exp->exp_obd && exp->exp_obd->u.obt.obt_jobstats.ojs_hash &&
+           (exp->exp_connect_flags & OBD_CONNECT_JOBSTATS))
+               lprocfs_job_stats_log(exp->exp_obd, jobid, opcode, amount);
+}
+
 struct ofd_device {
        struct dt_device         ofd_dt_dev;
        struct dt_device        *ofd_osd;
@@ -92,13 +111,14 @@ struct ofd_device {
 
        int                      ofd_max_group;
        obd_id                   ofd_last_objids[OFD_MAX_GROUPS];
-       cfs_mutex_t              ofd_create_locks[OFD_MAX_GROUPS];
+       struct mutex             ofd_create_locks[OFD_MAX_GROUPS];
        struct dt_object        *ofd_lastid_obj[OFD_MAX_GROUPS];
-       cfs_spinlock_t           ofd_objid_lock;
+       spinlock_t               ofd_objid_lock;
        unsigned long            ofd_destroys_in_progress;
+       int                      ofd_precreate_batch;
 
        /* protect all statfs-related counters */
-       cfs_spinlock_t           ofd_osfs_lock;
+       spinlock_t               ofd_osfs_lock;
        /* statfs optimization: we cache a bit  */
        struct obd_statfs        ofd_osfs;
        __u64                    ofd_osfs_age;
@@ -115,7 +135,7 @@ struct ofd_device {
 
        /* grants: all values in bytes */
        /* grant lock to protect all grant counters */
-       cfs_spinlock_t           ofd_grant_lock;
+       spinlock_t               ofd_grant_lock;
        /* total amount of dirty data reported by clients in incoming obdo */
        obd_size                 ofd_tot_dirty;
        /* sum of filesystem space granted to clients for async writes */
@@ -134,7 +154,7 @@ struct ofd_device {
        int                      ofd_fmd_max_num; /* per ofd ofd_mod_data */
        cfs_duration_t           ofd_fmd_max_age; /* time to fmd expiry */
 
-       cfs_spinlock_t           ofd_flags_lock;
+       spinlock_t               ofd_flags_lock;
        unsigned long            ofd_raid_degraded:1,
                                 /* sync journal on writes */
                                 ofd_syncjournal:1,
@@ -143,8 +163,6 @@ struct ofd_device {
                                 /* shall we grant space to clients not
                                  * supporting OBD_CONNECT_GRANT_PARAM? */
                                 ofd_grant_compat_disable:1;
-
-       struct lu_site           ofd_site;
 };
 
 static inline struct ofd_device *ofd_dev(struct lu_device *d)
@@ -290,6 +308,7 @@ void ofd_free_capa_keys(struct ofd_device *ofd);
 
 /* ofd_dev.c */
 extern struct lu_context_key ofd_thread_key;
+int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd);
 
 /* ofd_obd.c */
 extern struct obd_ops ofd_obd_ops;
@@ -306,6 +325,7 @@ int ofd_group_load(const struct lu_env *env, struct ofd_device *ofd, int);
 int ofd_fs_setup(const struct lu_env *env, struct ofd_device *ofd,
                 struct obd_device *obd);
 void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd);
+int ofd_precreate_batch(struct ofd_device *ofd, int batch);
 
 /* ofd_io.c */
 int ofd_preprw(const struct lu_env *env,int cmd, struct obd_export *exp,
@@ -331,9 +351,19 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
                    void *cookie);
 
 /* lproc_ofd.c */
+#ifdef LPROCFS
 void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars);
 int lproc_ofd_attach_seqstat(struct obd_device *dev);
 extern struct file_operations ofd_per_nid_stats_fops;
+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 int lproc_ofd_attach_seqstat(struct obd_device *dev) {}
+static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {}
+#endif
 
 /* ofd_objects.c */
 struct ofd_object *ofd_object_find(const struct lu_env *env,
@@ -344,8 +374,8 @@ struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
                                             const struct lu_fid *fid,
                                             struct lu_attr *attr);
 int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo);
-int ofd_precreate_object(const struct lu_env *env, struct ofd_device *ofd,
-                        obd_id id, obd_seq seq);
+int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
+                         obd_id id, obd_seq group, int nr);
 
 void ofd_object_put(const struct lu_env *env, struct ofd_object *fo);
 int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
@@ -434,7 +464,7 @@ extern struct ldlm_valblock_ops ofd_lvbo;
 
 /* ofd_dlm.c */
 int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp,
-                     void *req_cookie, ldlm_mode_t mode, int flags,
+                     void *req_cookie, ldlm_mode_t mode, __u64 flags,
                      void *data);
 
 static inline struct ofd_thread_info * ofd_info(const struct lu_env *env)