* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf)
{
struct brw_stats *s = &osd->od_brw_stats;
- unsigned long *last_block = NULL;
+ sector_t *last_block = NULL;
struct page **pages = iobuf->dr_pages;
struct page *last_page = NULL;
unsigned long discont_pages = 0;
unsigned long discont_blocks = 0;
- unsigned long *blocks = iobuf->dr_blocks;
+ sector_t *blocks = iobuf->dr_blocks;
int i, nr_pages = iobuf->dr_npages;
int blocks_per_page;
int rw = iobuf->dr_rw;
struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
LASSERT(osd != NULL);
- return seq_printf(m, "ldiskfs\n");
+ seq_puts(m, "ldiskfs\n");
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_fstype);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%s\n", osd->od_mntdev);
+ seq_printf(m, "%s\n", osd->od_mntdev);
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_mntdev);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%u\n", osd->od_read_cache);
+ seq_printf(m, "%u\n", osd->od_read_cache);
+ return 0;
}
static ssize_t
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%u\n", osd->od_writethrough_cache);
+ seq_printf(m, "%u\n", osd->od_writethrough_cache);
+ return 0;
}
static ssize_t
static int ldiskfs_osd_pdo_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+ seq_printf(m, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+ return 0;
}
static ssize_t
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%d\n", !dev->od_noscrub);
+ seq_printf(m, "%d\n", !dev->od_noscrub);
+ return 0;
}
static ssize_t
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64"\n", dev->od_full_scrub_ratio);
+ seq_printf(m, LPU64"\n", dev->od_full_scrub_ratio);
+ return 0;
}
static ssize_t
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64" (bad OI mappings/minute)\n",
- dev->od_full_scrub_threshold_rate);
+ seq_printf(m, LPU64" (bad OI mappings/minute)\n",
+ dev->od_full_scrub_threshold_rate);
+ return 0;
}
static ssize_t
static int
ldiskfs_osd_track_declares_assert_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%d\n", ldiskfs_track_declares_assert);
+ seq_printf(m, "%d\n", ldiskfs_track_declares_assert);
+ return 0;
}
static ssize_t
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64"\n", osd->od_readcache_max_filesize);
+ seq_printf(m, LPU64"\n", osd->od_readcache_max_filesize);
+ return 0;
}
static ssize_t
}
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);
+ seq_printf(m, "%d\n", (int)(dev->od_index_in_idif));
+ return 0;
}
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;
+
+ 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;
- dev->od_lma_self_repair = !!val;
+ 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);
.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 }
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff