LU-2384 kerberos: Support for MIT-kerberos >=1.8.X is broken

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

diff --git a/lustre/mdt/mdt_lproc.c b/lustre/mdt/mdt_lproc.c
index e627580..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,
@@ -976,6 +973,33 @@ static int lprocfs_wr_enable_remote_dir(struct file *file, const char *buffer,
        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 },
@@ -1015,7 +1039,9 @@ static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
                                        lprocfs_wr_job_interval, 0 },
        { "enable_remote_dir",          lprocfs_rd_enable_remote_dir,
                                        lprocfs_wr_enable_remote_dir,       0},
-        { 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[] = {