LU-3106 ofd: create additional symlinks to osd

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 7243c12..4c2fec3 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -383,7 +383,8 @@ static int ofd_recovery_complete(const struct lu_env *env,
         * precreate request size (see ofd_grant_create()
         */
        ofd_grant_connect(env, dev->ld_obd->obd_self_export,
-                         OST_MAX_PRECREATE * ofd->ofd_dt_conf.ddp_inodespace);
+                         OST_MAX_PRECREATE * ofd->ofd_dt_conf.ddp_inodespace,
+                         false);
        rc = next->ld_ops->ldo_recovery_complete(env, next);
        RETURN(rc);
 }
@@ -471,18 +472,38 @@ static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd)
        if (osd_dir == NULL)
                return;
 
-       if (lprocfs_srch(osd_dir, "brw_stats") == NULL)
-               return;
-
-       lprocfs_add_symlink("brw_stats", obd->obd_proc_entry,
-                           "../../%s/%s/brw_stats",
-                           osd_root->name, osd_dir->name);
+       if (lprocfs_srch(osd_dir, "brw_stats") != NULL)
+               lprocfs_add_symlink("brw_stats", obd->obd_proc_entry,
+                                   "../../%s/%s/brw_stats",
+                                   osd_root->name, osd_dir->name);
+
+       if (lprocfs_srch(osd_dir, "read_cache_enable") != NULL)
+               lprocfs_add_symlink("read_cache_enable", obd->obd_proc_entry,
+                                   "../../%s/%s/read_cache_enable",
+                                   osd_root->name, osd_dir->name);
+
+       if (lprocfs_srch(osd_dir, "readcache_max_filesize") != NULL)
+               lprocfs_add_symlink("readcache_max_filesize",
+                                   obd->obd_proc_entry,
+                                   "../../%s/%s/readcache_max_filesize",
+                                   osd_root->name, osd_dir->name);
+
+       if (lprocfs_srch(osd_dir, "writethrough_cache_enable") != NULL)
+               lprocfs_add_symlink("writethrough_cache_enable",
+                                   obd->obd_proc_entry,
+                                   "../../%s/%s/writethrough_cache_enable",
+                                   osd_root->name, osd_dir->name);
 }
 
 static void ofd_procfs_fini(struct ofd_device *ofd)
 {
        struct obd_device *obd = ofd_obd(ofd);
 
+       lprocfs_remove_proc_entry("writethrough_cache_enable",
+                                 obd->obd_proc_entry);
+       lprocfs_remove_proc_entry("readcache_max_filesize",
+                                 obd->obd_proc_entry);
+       lprocfs_remove_proc_entry("read_cache_enable", obd->obd_proc_entry);
        lprocfs_remove_proc_entry("brw_stats", obd->obd_proc_entry);
        lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
        lprocfs_free_per_client_stats(obd);
@@ -680,7 +701,8 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        if (osfs->os_bsize * osfs->os_blocks < OFD_PRECREATE_SMALL_FS)
                m->ofd_precreate_batch = OFD_PRECREATE_BATCH_SMALL;
 
-       snprintf(info->fti_u.name, sizeof(info->fti_u.name), "filter-%p", m);
+       snprintf(info->fti_u.name, sizeof(info->fti_u.name), "%s-%s",
+                "filter"/*LUSTRE_OST_NAME*/, obd->obd_uuid.uuid);
        m->ofd_namespace = ldlm_namespace_new(obd, info->fti_u.name,
                                              LDLM_NAMESPACE_SERVER,
                                              LDLM_NAMESPACE_GREEDY,