These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / include / lustre_fld.h

diff --git a/kernel/drivers/staging/lustre/lustre/include/lustre_fld.h b/kernel/drivers/staging/lustre/lustre/include/lustre_fld.h
index 5ee4b1e..d8b3db9 100644 (file)
--- a/kernel/drivers/staging/lustre/lustre/include/lustre_fld.h
+++ b/kernel/drivers/staging/lustre/lustre/include/lustre_fld.h
@@ -61,7 +61,6 @@ enum {
        LUSTRE_CLI_FLD_HASH_RRB
 };
 
-
 struct lu_fld_target {
        struct list_head               ft_chain;
        struct obd_export       *ft_exp;
@@ -70,14 +69,6 @@ struct lu_fld_target {
 };
 
 struct lu_server_fld {
-       /**
-        * Fld dir proc entry. */
-       struct proc_dir_entry    *lsf_proc_dir;
-
-       /**
-        * /fld file object device */
-       struct dt_object        *lsf_obj;
-
        /**
         * super sequence controller export, needed to forward fld
         * lookup  request. */
@@ -99,8 +90,8 @@ struct lu_server_fld {
 
 struct lu_client_fld {
        /**
-        * Client side proc entry. */
-       struct proc_dir_entry    *lcf_proc_dir;
+        * Client side debugfs entry. */
+       struct dentry           *lcf_debugfs_entry;
 
        /**
         * List of exports client FLD knows about. */
@@ -123,10 +114,10 @@ struct lu_client_fld {
        struct fld_cache        *lcf_cache;
 
        /**
-        * Client fld proc entry name. */
-       char                 lcf_name[LUSTRE_MDT_MAXNAMELEN];
+        * Client fld debugfs entry name. */
+       char                     lcf_name[LUSTRE_MDT_MAXNAMELEN];
 
-       int                   lcf_flags;
+       int                      lcf_flags;
 };
 
 /* Client methods */
@@ -153,7 +144,7 @@ int fld_client_add_target(struct lu_client_fld *fld,
 int fld_client_del_target(struct lu_client_fld *fld,
                          __u64 idx);
 
-void fld_client_proc_fini(struct lu_client_fld *fld);
+void fld_client_debugfs_fini(struct lu_client_fld *fld);
 
 /** @} fld */