*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
#define DEBUG_SUBSYSTEM S_OSD
#include <lprocfs_status.h>
-#include <lustre/lustre_idl.h>
#include "osd_internal.h"
if (unlikely(nr_pages == 0))
return;
- blocks_per_page = PAGE_CACHE_SIZE >> osd_sb(osd)->s_blocksize_bits;
+ blocks_per_page = PAGE_SIZE >> osd_sb(osd)->s_blocksize_bits;
lprocfs_oh_tally_log2(&s->hist[BRW_R_PAGES+rw], nr_pages);
lprocfs_oh_tally(&s->hist[BRW_R_DISCONT_BLOCKS+rw], discont_blocks);
}
-#define pct(a, b) (b ? a * 100 / b : 0)
-
static void display_brw_stats(struct seq_file *seq, char *name, char *units,
struct obd_histogram *read, struct obd_histogram *write, int scale)
{
else
seq_printf(seq, "%uM", scale << (i-20));
- seq_printf(seq, ":\t\t%10lu %3lu %3lu | %4lu %3lu %3lu\n",
+ seq_printf(seq, ":\t\t%10lu %3u %3u | %4lu %3u %3u\n",
r, pct(r, read_tot), pct(read_cum, read_tot),
w, pct(w, write_tot), pct(write_cum, write_tot));
static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
{
- struct timeval now;
+ struct timespec64 now;
/* this sampling races with updates */
- do_gettimeofday(&now);
- seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n",
- now.tv_sec, now.tv_usec);
+ ktime_get_real_ts64(&now);
+
+ seq_printf(seq, "snapshot_time: %lld.%09ld (secs.nsecs)\n",
+ (s64)now.tv_sec, now.tv_nsec);
display_brw_stats(seq, "pages per bulk r/w", "rpcs",
&brw_stats->hist[BRW_R_PAGES],
&brw_stats->hist[BRW_W_DISK_IOSIZE], 1);
}
-#undef pct
-
static int osd_brw_stats_seq_show(struct seq_file *seq, void *v)
{
struct osd_device *osd = seq->private;
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
+ bool val;
int rc;
- __s64 val;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- osd->od_read_cache = !!val;
+ osd->od_read_cache = val;
return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_cache);
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
+ bool val;
int rc;
- __s64 val;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- osd->od_writethrough_cache = !!val;
+ osd->od_writethrough_cache = val;
return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_wcache);
return rc == 0 ? count : rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(ldiskfs, osd_force_sync);
+LPROC_SEQ_FOPS_WR_ONLY(ldiskfs, osd_force_sync);
static int ldiskfs_osd_pdo_seq_show(struct seq_file *m, void *data)
{
ldiskfs_osd_pdo_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
+ bool pdo;
int rc;
- __s64 pdo;
- rc = lprocfs_str_to_s64(buffer, count, &pdo);
+ rc = kstrtobool_from_user(buffer, count, &pdo);
if (rc != 0)
return rc;
- ldiskfs_pdo = !!pdo;
+ ldiskfs_pdo = pdo;
return count;
}
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- seq_printf(m, "%d\n", !dev->od_noscrub);
+ seq_printf(m, "%lld\n", dev->od_auto_scrub_interval);
return 0;
}
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
+ s64 val;
int rc;
- __s64 val;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoll_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- dev->od_noscrub = !val;
+ dev->od_auto_scrub_interval = val;
return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_auto_scrub);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- seq_printf(m, LPU64"\n", dev->od_full_scrub_ratio);
+ seq_printf(m, "%llu\n", dev->od_full_scrub_ratio);
return 0;
}
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
+ s64 val;
int rc;
- __s64 val;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoll_from_user(buffer, count, 0, &val);
if (rc != 0)
return rc;
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- seq_printf(m, LPU64" (bad OI mappings/minute)\n",
+ seq_printf(m, "%llu (bad OI mappings/minute)\n",
dev->od_full_scrub_threshold_rate);
return 0;
}
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
+ u64 val;
int rc;
- __s64 val;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoull_from_user(buffer, count, 0, &val);
if (rc != 0)
return rc;
- if (val < 0)
- return -EINVAL;
-
dev->od_full_scrub_threshold_rate = val;
return count;
}
const char __user *buffer,
size_t count, loff_t *off)
{
- __s64 track_declares_assert;
+ bool track_declares_assert;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &track_declares_assert);
- if (rc != 0)
+ rc = kstrtobool_from_user(buffer, count, &track_declares_assert);
+ if (rc)
return rc;
- ldiskfs_track_declares_assert = !!track_declares_assert;
+ ldiskfs_track_declares_assert = track_declares_assert;
return count;
}
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return osd_scrub_dump(m, dev);
+ osd_scrub_dump(m, dev);
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_oi_scrub);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- seq_printf(m, LPU64"\n", osd->od_readcache_max_filesize);
+ seq_printf(m, "%llu\n", osd->od_readcache_max_filesize);
return 0;
}
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
- __s64 val;
+ s64 val;
int rc;
LASSERT(osd != NULL);
struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
struct lu_target *tgt;
- __s64 val;
+ bool val;
int rc;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc != 0)
return rc;
if (dev->od_index_in_idif) {
- if (val != 0)
+ if (val)
return count;
LCONSOLE_WARN("%s: OST-index in IDIF has been enabled, "
return -EPERM;
}
- if (val == 0)
+ if (!val)
return count;
rc = lu_env_init(&env, LCT_DT_THREAD);
}
#endif
+static int ldiskfs_osd_index_backup_seq_show(struct seq_file *m, void *data)
+{
+ struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private);
+
+ LASSERT(dev != NULL);
+ if (unlikely(dev->od_mnt == NULL))
+ return -EINPROGRESS;
+
+ seq_printf(m, "%d\n", dev->od_index_backup_policy);
+ return 0;
+}
+
+static ssize_t ldiskfs_osd_index_backup_seq_write(struct file *file,
+ const char __user *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;
+
+ LASSERT(dev != NULL);
+ if (unlikely(dev->od_mnt == NULL))
+ return -EINPROGRESS;
+
+ rc = kstrtoint_from_user(buffer, count, 0, &val);
+ if (rc)
+ return rc;
+
+ dev->od_index_backup_policy = val;
+ return count;
+}
+LPROC_SEQ_FOPS(ldiskfs_osd_index_backup);
+
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_blksize);
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytestotal);
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytesfree);
.fops = &ldiskfs_osd_wcache_fops },
{ .name = "readcache_max_filesize",
.fops = &ldiskfs_osd_readcache_fops },
+ { .name = "index_backup",
+ .fops = &ldiskfs_osd_index_backup_fops },
{ NULL }
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff