- re-arrange seq and fld lprocfs stuff, put their lproc into "fld" and "seq" dirs...

[fs/lustre-release.git] / lustre / include / lustre_fld.h

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index 6549d3d..f6de9bb 100644 (file)
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -24,6 +24,7 @@
 #define __LINUX_FLD_H
 
 #include <lustre/lustre_idl.h>
+#include <lustre_mdt.h>
 #include <dt_object.h>
 
 #include <libcfs/list.h>
@@ -40,14 +41,20 @@ enum {
         LUSTRE_CLI_FLD_HASH_RRB
 };
 
-struct fld_target {
-        struct list_head   fldt_chain;
-        struct obd_export *fldt_exp;
-        __u64              fldt_idx;
+struct lu_server_fld;
+
+struct lu_fld_target {
+        struct list_head         ft_chain;
+        struct obd_export       *ft_exp;
+        struct lu_server_fld    *ft_srv;
+        __u64                    ft_idx;
 };
 
-typedef int (*fld_hash_func_t) (struct lu_client_fld *, __u64);
-typedef struct fld_target * (*fld_scan_func_t) (struct lu_client_fld *, __u64);
+typedef int
+(*fld_hash_func_t) (struct lu_client_fld *, __u64);
+
+typedef struct lu_fld_target *
+(*fld_scan_func_t) (struct lu_client_fld *, __u64);
 
 struct lu_fld_hash {
         const char              *fh_name;
@@ -56,20 +63,14 @@ struct lu_fld_hash {
 };
 
 struct lu_server_fld {
-        /* service proc entry */
-        cfs_proc_dir_entry_t    *fld_proc_entry;
-
         /* fld dir proc entry */
-        cfs_proc_dir_entry_t    *fld_proc_dir;
-
-        /* pointer to started server service */
-        struct ptlrpc_service   *fld_service;
+        cfs_proc_dir_entry_t    *lsf_proc_dir;
 
         /* /fld file object device */
-        struct dt_object        *fld_obj;
+        struct dt_object        *lsf_obj;
 
         /* fld service name in form "fld-MDTXXX" */
-        char                     fld_name[80];
+        char                     lsf_name[80];
 };
 
 struct fld_cache_entry {
@@ -110,65 +111,85 @@ struct fld_cache_info {
 
 struct lu_client_fld {
         /* client side proc entry */
-        cfs_proc_dir_entry_t    *fld_proc_dir;
+        cfs_proc_dir_entry_t    *lcf_proc_dir;
 
         /* list of exports client FLD knows about */
-        struct list_head         fld_targets;
+        struct list_head         lcf_targets;
 
         /* current hash to be used to chose an export */
-        struct lu_fld_hash      *fld_hash;
+        struct lu_fld_hash      *lcf_hash;
 
         /* exports count */
-        int                      fld_count;
+        int                      lcf_count;
 
         /* lock protecting exports list and fld_hash */
-        spinlock_t               fld_lock;
+        spinlock_t               lcf_lock;
 
         /* client FLD cache */
-        struct fld_cache_info   *fld_cache;
+        struct fld_cache_info   *lcf_cache;
 
         /* client fld proc entry name */
-        char                     fld_name[80];
+        char                     lcf_name[80];
+
+        const struct lu_context       *lcf_ctx;
 };
 
-/* server methods */
+int fld_query(struct com_thread_info *info);
+
+/* Server methods */
 int fld_server_init(struct lu_server_fld *fld,
-                    const struct lu_context *ctx,
                     struct dt_device *dt,
-                    const char *uuid);
+                    const char *prefix,
+                    const struct lu_context *ctx);
 
 void fld_server_fini(struct lu_server_fld *fld,
                      const struct lu_context *ctx);
 
-/* client methods */
+int fld_server_create(struct lu_server_fld *fld,
+                      const struct lu_context *ctx,
+                      seqno_t seq, mdsno_t mds);
+
+int fld_server_delete(struct lu_server_fld *fld,
+                      const struct lu_context *ctx,
+                      seqno_t seq);
+
+int fld_server_lookup(struct lu_server_fld *fld,
+                      const struct lu_context *ctx,
+                      seqno_t seq, mdsno_t *mds);
+
+/* Client methods */
 int fld_client_init(struct lu_client_fld *fld,
-                    const char *uuid,
-                    int hash);
+                    const char *prefix, int hash);
 
 void fld_client_fini(struct lu_client_fld *fld);
 
 int fld_client_lookup(struct lu_client_fld *fld,
-                      seqno_t seq, mdsno_t *mds);
+                      seqno_t seq, mdsno_t *mds,
+                      const struct lu_context *ctx);
 
 int fld_client_create(struct lu_client_fld *fld,
-                      seqno_t seq, mdsno_t mds);
+                      seqno_t seq, mdsno_t mds,
+                      const struct lu_context *ctx);
 
 int fld_client_delete(struct lu_client_fld *fld,
-                      seqno_t seq);
+                      seqno_t seq,
+                      const struct lu_context *ctx);
 
 int fld_client_add_target(struct lu_client_fld *fld,
-                          struct obd_export *exp);
+                          struct lu_fld_target *tar);
 
 int fld_client_del_target(struct lu_client_fld *fld,
-                          struct obd_export *exp);
+                          __u64 idx);
 
-/* cache methods */
+/* Cache methods */
 struct fld_cache_info *fld_cache_init(int hash_size,
                                       int cache_size,
                                       int cache_threshold);
 
 void fld_cache_fini(struct fld_cache_info *cache);
 
+void fld_cache_flush(struct fld_cache_info *cache);
+
 int fld_cache_insert(struct fld_cache_info *cache,
                      seqno_t seq, mdsno_t mds);