Revert "LU-2459 osd: add LMA incompat flag check"

[fs/lustre-release.git] / lustre / mdt / mdt_lproc.c

diff --git a/lustre/mdt/mdt_lproc.c b/lustre/mdt/mdt_lproc.c
index 1560ec1..e9163cc 100644 (file)
--- a/lustre/mdt/mdt_lproc.c
+++ b/lustre/mdt/mdt_lproc.c
@@ -258,13 +258,11 @@ int mdt_procfs_init(struct mdt_device *mdt, const char *name)
         RETURN(rc);
 }
 
-int mdt_procfs_fini(struct mdt_device *mdt)
+void mdt_procfs_fini(struct mdt_device *mdt)
 {
         struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
         struct obd_device *obd = ld->ld_obd;
 
-       lprocfs_job_stats_fini(obd);
-
         if (obd->obd_proc_exports_entry) {
                 lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
                 obd->obd_proc_exports_entry = NULL;
@@ -274,8 +272,7 @@ int mdt_procfs_fini(struct mdt_device *mdt)
         ptlrpc_lprocfs_unregister_obd(obd);
         lprocfs_free_md_stats(obd);
         lprocfs_free_obd_stats(obd);
-
-        RETURN(0);
+       lprocfs_job_stats_fini(obd);
 }
 
 static int lprocfs_rd_identity_expire(char *page, char **start, off_t off,
@@ -885,8 +882,8 @@ static int lprocfs_wr_mdt_som(struct file *file, const char *buffer,
         cfs_list_for_each_entry(exp, &obd->obd_exports, exp_obd_chain) {
                 if (exp == obd->obd_self_export)
                         continue;
-                if (exp->exp_connect_flags & OBD_CONNECT_MDS_MDS)
-                        continue;
+               if (exp_connect_flags(exp) & OBD_CONNECT_MDS_MDS)
+                       continue;
                 /* Some clients are already connected, skip the change */
                 LCONSOLE_INFO("%s is already connected, SOM will be %s on "
                               "the next mount\n", exp->exp_client_uuid.uuid,
@@ -948,6 +945,61 @@ out:
         return count;
 }
 
+static int lprocfs_rd_enable_remote_dir(char *page, char **start, off_t off,
+                                       int count, int *eof, void *data)
+{
+       struct obd_device *obd = data;
+       struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+       return snprintf(page, count, "%u\n", mdt->mdt_enable_remote_dir);
+}
+
+static int lprocfs_wr_enable_remote_dir(struct file *file, const char *buffer,
+                                       unsigned long count, void *data)
+{
+       struct obd_device *obd = data;
+       struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+       __u32 val;
+       int rc;
+
+       rc = lprocfs_write_helper(buffer, count, &val);
+       if (rc)
+               return rc;
+
+       if (val < 0 || val > 1)
+               return -ERANGE;
+
+       mdt->mdt_enable_remote_dir = val;
+       return count;
+}
+
+static int lprocfs_rd_enable_remote_dir_gid(char *page, char **start, off_t off,
+                                           int count, int *eof, void *data)
+{
+       struct obd_device *obd = data;
+       struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+       return snprintf(page, count, "%d\n",
+                       (int)mdt->mdt_enable_remote_dir_gid);
+}
+
+static int lprocfs_wr_enable_remote_dir_gid(struct file *file,
+                                           const char *buffer,
+                                           unsigned long count, void *data)
+{
+       struct obd_device *obd = data;
+       struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+       __u32 val;
+       int rc;
+
+       rc = lprocfs_write_helper(buffer, count, &val);
+       if (rc)
+               return rc;
+
+       mdt->mdt_enable_remote_dir_gid = val;
+       return count;
+}
+
 static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
         { "uuid",                       lprocfs_rd_uuid,                 0, 0 },
         { "recovery_status",            lprocfs_obd_rd_recovery_status,  0, 0 },
@@ -985,7 +1037,11 @@ static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
                                         lprocfs_obd_wr_ir_factor,           0 },
        { "job_cleanup_interval",       lprocfs_rd_job_interval,
                                        lprocfs_wr_job_interval, 0 },
-        { 0 }
+       { "enable_remote_dir",          lprocfs_rd_enable_remote_dir,
+                                       lprocfs_wr_enable_remote_dir,       0},
+       { "enable_remote_dir_gid",      lprocfs_rd_enable_remote_dir_gid,
+                                       lprocfs_wr_enable_remote_dir_gid,   0},
+       { 0 }
 };
 
 static struct lprocfs_vars lprocfs_mdt_module_vars[] = {
@@ -1018,7 +1074,7 @@ void mdt_counter_incr(struct ptlrpc_request *req, int opcode)
        if (exp->exp_nid_stats && exp->exp_nid_stats->nid_stats != NULL)
                lprocfs_counter_incr(exp->exp_nid_stats->nid_stats, opcode);
        if (exp->exp_obd && exp->exp_obd->u.obt.obt_jobstats.ojs_hash &&
-           (exp->exp_connect_flags & OBD_CONNECT_JOBSTATS))
+           (exp_connect_flags(exp) & OBD_CONNECT_JOBSTATS))
                lprocfs_job_stats_log(exp->exp_obd,
                                      lustre_msg_get_jobid(req->rq_reqmsg),
                                      opcode, 1);