#include "osd_internal.h"
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf)
{
}
LPROC_SEQ_FOPS(ldiskfs_osd_full_scrub_ratio);
-static int ldiskfs_osd_full_scrub_speed_seq_show(struct seq_file *m, void *data)
+static int ldiskfs_osd_full_scrub_threshold_rate_seq_show(struct seq_file *m,
+ void *data)
{
struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private);
return -EINPROGRESS;
return seq_printf(m, LPU64" (bad OI mappings/minute)\n",
- dev->od_full_scrub_speed);
+ dev->od_full_scrub_threshold_rate);
}
static ssize_t
-ldiskfs_osd_full_scrub_speed_seq_write(struct file *file, const char *buffer,
- size_t count, loff_t *off)
+ldiskfs_osd_full_scrub_threshold_rate_seq_write(struct file *file,
+ const char *buffer,
+ size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
if (val < 0)
return -EINVAL;
- dev->od_full_scrub_speed = val;
+ dev->od_full_scrub_threshold_rate = val;
return count;
}
-LPROC_SEQ_FOPS(ldiskfs_osd_full_scrub_speed);
+LPROC_SEQ_FOPS(ldiskfs_osd_full_scrub_threshold_rate);
static int
ldiskfs_osd_track_declares_assert_seq_show(struct seq_file *m, void *data)
}
LPROC_SEQ_FOPS(ldiskfs_osd_readcache);
-static int ldiskfs_osd_lma_self_repair_seq_show(struct seq_file *m, void *data)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 52, 0)
+static int ldiskfs_osd_index_in_idif_seq_show(struct seq_file *m, void *data)
{
struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%d\n", !!dev->od_lma_self_repair);
+ return seq_printf(m, "%d\n", (int)(dev->od_index_in_idif));
}
static ssize_t
-ldiskfs_osd_lma_self_repair_seq_write(struct file *file, const char *buffer,
- size_t count, loff_t *off)
+ldiskfs_osd_index_in_idif_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct seq_file *m = file->private_data;
- struct dt_device *dt = m->private;
- struct osd_device *dev = osd_dt_dev(dt);
- int val;
- int rc;
+ struct lu_env env;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
+ struct osd_device *dev = osd_dt_dev(dt);
+ struct lu_target *tgt;
+ int val;
+ int rc;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
rc = lprocfs_write_helper(buffer, count, &val);
- if (rc)
+ if (rc != 0)
return rc;
- dev->od_lma_self_repair = !!val;
+ if (dev->od_index_in_idif) {
+ if (val != 0)
+ return count;
+
+ LCONSOLE_WARN("%s: OST-index in IDIF has been enabled, "
+ "it cannot be reverted back.\n", osd_name(dev));
+ return -EPERM;
+ }
+
+ if (val == 0)
+ return count;
+
+ rc = lu_env_init(&env, LCT_DT_THREAD);
+ if (rc != 0)
+ return rc;
+
+ tgt = dev->od_dt_dev.dd_lu_dev.ld_site->ls_tgt;
+ tgt->lut_lsd.lsd_feature_rocompat |= OBD_ROCOMPAT_IDX_IN_IDIF;
+ rc = tgt_server_data_update(&env, tgt, 1);
+ lu_env_fini(&env);
+ if (rc < 0)
+ return rc;
+
+ LCONSOLE_INFO("%s: enable OST-index in IDIF successfully, "
+ "it cannot be reverted back.\n", osd_name(dev));
+
+ dev->od_index_in_idif = 1;
return count;
}
-LPROC_SEQ_FOPS(ldiskfs_osd_lma_self_repair);
+LPROC_SEQ_FOPS(ldiskfs_osd_index_in_idif);
+
+int osd_register_proc_index_in_idif(struct osd_device *osd)
+{
+ struct proc_dir_entry *proc;
+
+ proc = proc_create_data("index_in_idif", 0, osd->od_proc_entry,
+ &ldiskfs_osd_index_in_idif_fops,
+ &osd->od_dt_dev);
+ if (proc == NULL)
+ return -ENOMEM;
+
+ return 0;
+}
+#endif
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_blksize);
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytestotal);
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_filestotal);
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_filesfree);
-struct lprocfs_seq_vars lprocfs_osd_obd_vars[] = {
+struct lprocfs_vars lprocfs_osd_obd_vars[] = {
{ .name = "blocksize",
.fops = &ldiskfs_dt_blksize_fops },
{ .name = "kbytestotal",
.fops = &ldiskfs_osd_auto_scrub_fops },
{ .name = "full_scrub_ratio",
.fops = &ldiskfs_osd_full_scrub_ratio_fops },
- { .name = "full_scrub_speed",
- .fops = &ldiskfs_osd_full_scrub_speed_fops },
+ { .name = "full_scrub_threshold_rate",
+ .fops = &ldiskfs_osd_full_scrub_threshold_rate_fops },
{ .name = "oi_scrub",
.fops = &ldiskfs_osd_oi_scrub_fops },
{ .name = "read_cache_enable",
.fops = &ldiskfs_osd_wcache_fops },
{ .name = "readcache_max_filesize",
.fops = &ldiskfs_osd_readcache_fops },
- { .name = "lma_self_repair",
- .fops = &ldiskfs_osd_lma_self_repair_fops },
{ NULL }
};
-struct lprocfs_seq_vars lprocfs_osd_module_vars[] = {
+struct lprocfs_vars lprocfs_osd_module_vars[] = {
{ .name = "track_declares_assert",
.fops = &ldiskfs_osd_track_declares_assert_fops },
{ NULL }
LASSERT(type != NULL);
/* Find the type procroot and add the proc entry for this device */
- osd->od_proc_entry = lprocfs_seq_register(name, type->typ_procroot,
- lprocfs_osd_obd_vars,
- &osd->od_dt_dev);
+ osd->od_proc_entry = lprocfs_register(name, type->typ_procroot,
+ lprocfs_osd_obd_vars,
+ &osd->od_dt_dev);
if (IS_ERR(osd->od_proc_entry)) {
rc = PTR_ERR(osd->od_proc_entry);
CERROR("Error %d setting up lprocfs for %s\n",
git://git.whamcloud.com / fs / lustre-release.git / blobdiff