* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2014 Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
LPROC_SEQ_FOPS_RO(ofd_seqs);
/**
- * Show estimate of total amount of dirty data on clients.
- *
- * \param[in] m seq_file handle
- * \param[in] data unused for single entry
- *
- * \retval 0 on success
- * \retval negative value on error
- */
-static int ofd_tot_dirty_seq_show(struct seq_file *m, void *data)
-{
- struct obd_device *obd = m->private;
- struct ofd_device *ofd;
-
- LASSERT(obd != NULL);
- ofd = ofd_dev(obd->obd_lu_dev);
- seq_printf(m, LPU64"\n", ofd->ofd_tot_dirty);
- return 0;
-}
-LPROC_SEQ_FOPS_RO(ofd_tot_dirty);
-
-/**
- * Show total amount of space granted to clients.
- *
- * \param[in] m seq_file handle
- * \param[in] data unused for single entry
- *
- * \retval 0 on success
- * \retval negative value on error
- */
-static int ofd_tot_granted_seq_show(struct seq_file *m, void *data)
-{
- struct obd_device *obd = m->private;
- struct ofd_device *ofd;
-
- LASSERT(obd != NULL);
- ofd = ofd_dev(obd->obd_lu_dev);
- seq_printf(m, LPU64"\n", ofd->ofd_tot_granted);
- return 0;
-}
-LPROC_SEQ_FOPS_RO(ofd_tot_granted);
-
-/**
- * Show total amount of space used by IO in progress.
- *
- * \param[in] m seq_file handle
- * \param[in] data unused for single entry
- *
- * \retval 0 on success
- * \retval negative value on error
- */
-static int ofd_tot_pending_seq_show(struct seq_file *m, void *data)
-{
- struct obd_device *obd = m->private;
- struct ofd_device *ofd;
-
- LASSERT(obd != NULL);
- ofd = ofd_dev(obd->obd_lu_dev);
- seq_printf(m, LPU64"\n", ofd->ofd_tot_pending);
- return 0;
-}
-LPROC_SEQ_FOPS_RO(ofd_tot_pending);
-
-/**
* Show total number of grants for precreate.
*
* \param[in] m seq_file handle
LASSERT(obd != NULL);
seq_printf(m, "%ld\n",
- obd->obd_self_export->exp_filter_data.fed_grant);
+ obd->obd_self_export->exp_target_data.ted_grant);
return 0;
}
LPROC_SEQ_FOPS_RO(ofd_grant_precreate);
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- __s64 val;
+ unsigned int val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtouint_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- if (val < 1 || val > INT_MAX)
+ if (val < 1 || val > 65536)
return -EINVAL;
spin_lock(&ofd->ofd_batch_lock);
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- __s64 val;
+ int val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoint_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- if (val > 65536 || val < 1)
+ if (val < 1 || val > 65536)
return -EINVAL;
ofd->ofd_fmd_max_num = val;
/**
* Show the maximum age of FMD data in seconds.
*
- * Though it is shown in seconds, it is stored internally in units
- * of jiffies for efficiency.
- *
* \param[in] m seq_file handle
* \param[in] data unused for single entry
*
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- seq_printf(m, "%ld\n", jiffies_to_msecs(ofd->ofd_fmd_max_age) /
- MSEC_PER_SEC);
+ seq_printf(m, "%lld\n", ofd->ofd_fmd_max_age);
return 0;
}
* Set the maximum age of FMD data in seconds.
*
* This defines how long FMD data stays in the FMD list.
- * It is stored internally in units of jiffies for efficiency.
*
* \param[in] file proc file
* \param[in] buffer string which represents maximum number
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- __s64 val;
- int rc;
+ time64_t val;
+ int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoll_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- if (val > 65536 || val < 1)
+ if (val < 1 || val > 65536) /* ~ 18 hour max */
return -EINVAL;
- ofd->ofd_fmd_max_age = msecs_to_jiffies(val * MSEC_PER_SEC);
+ ofd->ofd_fmd_max_age = val;
return count;
}
LPROC_SEQ_FOPS(ofd_fmd_max_age);
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+ bool val;
int rc;
- __s64 val;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
spin_lock(&ofd->ofd_flags_lock);
- ofd->ofd_raid_degraded = !!val;
+ ofd->ofd_raid_degraded = val;
spin_unlock(&ofd->ofd_flags_lock);
return count;
}
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- __s64 val;
+ bool val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- if (val < 0)
- return -EINVAL;
-
spin_lock(&ofd->ofd_flags_lock);
- ofd->ofd_syncjournal = !!val;
+ ofd->ofd_syncjournal = val;
ofd_slc_set(ofd);
spin_unlock(&ofd->ofd_flags_lock);
__s64 val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = lprocfs_str_with_units_to_s64(buffer, count, &val, 'M');
if (rc)
return rc;
- if (val < 0)
+ if (val <= 0)
return -EINVAL;
- val = val * ONE_MB_BRW_SIZE;
- if (val <= 0 || val > DT_MAX_BRW_SIZE ||
- val < (1 << ofd->ofd_blockbits))
+ if (val > DT_MAX_BRW_SIZE ||
+ val < (1 << ofd->ofd_lut.lut_tgd.tgd_blockbits))
return -ERANGE;
spin_lock(&ofd->ofd_flags_lock);
struct obd_device *obd = m->private;
struct lu_target *tgt = obd->u.obt.obt_lut;
char kernbuf[SYNC_STATES_MAXLEN];
- __s64 val = -1;
+ int val = -1;
int i;
if (count == 0 || count >= sizeof(kernbuf))
/* Legacy numeric codes */
if (val == -1) {
- int rc = lprocfs_str_to_s64(buffer, count, &val);
+ int rc = kstrtoint_from_user(buffer, count, 0, &val);
if (rc)
return rc;
}
LPROC_SEQ_FOPS(ofd_sync_lock_cancel);
/**
- * Show if grants compatibility mode is disabled.
- *
- * When ofd_grant_compat_disable is set, we don't grant any space to clients
- * not supporting OBD_CONNECT_GRANT_PARAM. Otherwise, space granted to such
- * a client is inflated since it consumes PAGE_SIZE of grant space per
- * block, (i.e. typically 4kB units), but underlaying file system might have
- * block size bigger than page size, e.g. ZFS. See LU-2049 for details.
- *
- * \param[in] m seq_file handle
- * \param[in] data unused for single entry
- *
- * \retval 0 on success
- * \retval negative value on error
- */
-static int ofd_grant_compat_disable_seq_show(struct seq_file *m, void *data)
-{
- struct obd_device *obd = m->private;
- struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-
- seq_printf(m, "%u\n", ofd->ofd_grant_compat_disable);
- return 0;
-}
-
-/**
- * Change grant compatibility mode.
- *
- * Setting ofd_grant_compat_disable prohibit any space granting to clients
- * not supporting OBD_CONNECT_GRANT_PARAM. See details above.
- *
- * \param[in] file proc file
- * \param[in] buffer string which represents mode
- * 1: disable compatibility mode
- * 0: enable compatibility mode
- * \param[in] count \a buffer length
- * \param[in] off unused for single entry
- *
- * \retval \a count on success
- * \retval negative number on error
- */
-static ssize_t
-ofd_grant_compat_disable_seq_write(struct file *file,
- const char __user *buffer,
- size_t count, loff_t *off)
-{
- struct seq_file *m = file->private_data;
- struct obd_device *obd = m->private;
- struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- __s64 val;
- int rc;
-
- rc = lprocfs_str_to_s64(buffer, count, &val);
- if (rc)
- return rc;
-
- if (val < 0)
- return -EINVAL;
-
- spin_lock(&ofd->ofd_flags_lock);
- ofd->ofd_grant_compat_disable = !!val;
- spin_unlock(&ofd->ofd_flags_lock);
-
- return count;
-}
-LPROC_SEQ_FOPS(ofd_grant_compat_disable);
-
-/**
* Show the limit of soft sync RPCs.
*
* This value defines how many IO RPCs with OBD_BRW_SOFT_SYNC flag
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- return lprocfs_uint_seq_show(m, &ofd->ofd_soft_sync_limit);
+ seq_printf(m, "%u\n", ofd->ofd_soft_sync_limit);
+ return 0;
}
/**
ofd_soft_sync_limit_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
- struct seq_file *m = file->private_data;
+ struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+ unsigned int val;
+ int rc;
+
+ rc = kstrtouint_from_user(buffer, count, 0, &val);
+ if (rc < 0)
+ return rc;
- return lprocfs_uint_seq_write(file, buffer, count,
- (loff_t *) &ofd->ofd_soft_sync_limit);
+ ofd->ofd_soft_sync_limit = val;
+ return 0;
}
LPROC_SEQ_FOPS(ofd_soft_sync_limit);
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- __s64 val;
+ unsigned long long val;
int rc;
- 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 -ERANGE;
-
rc = lfsck_set_speed(ofd->ofd_osd, val);
return rc != 0 ? rc : count;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- seq_printf(m, "switch: %s\ndetected: "LPU64"\nrepaired: "LPU64"\n",
+ seq_printf(m, "switch: %s\ndetected: %llu\nrepaired: %llu\n",
ofd->ofd_lfsck_verify_pfid ? "on" : "off",
ofd->ofd_inconsistency_self_detected,
ofd->ofd_inconsistency_self_repaired);
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- __s64 val;
+ bool val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
- if (rc != 0)
+ rc = kstrtobool_from_user(buffer, count, &val);
+ if (rc)
return rc;
- ofd->ofd_lfsck_verify_pfid = !!val;
+ ofd->ofd_lfsck_verify_pfid = val;
+ if (!ofd->ofd_lfsck_verify_pfid) {
+ ofd->ofd_inconsistency_self_detected = 0;
+ ofd->ofd_inconsistency_self_repaired = 0;
+ }
return count;
}
}
LPROC_SEQ_FOPS_RO(ofd_site_stats);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, uuid);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, blksize);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, kbytestotal);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, kbytesfree);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, kbytesavail);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, filestotal);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, filesfree);
-
LPROC_SEQ_FOPS_RO_TYPE(ofd, recovery_status);
LPROC_SEQ_FOPS_RW_TYPE(ofd, recovery_time_soft);
LPROC_SEQ_FOPS_RW_TYPE(ofd, recovery_time_hard);
-LPROC_SEQ_FOPS_WO_TYPE(ofd, evict_client);
+LPROC_SEQ_FOPS_WR_ONLY(ofd, evict_client);
LPROC_SEQ_FOPS_RO_TYPE(ofd, num_exports);
LPROC_SEQ_FOPS_RO_TYPE(ofd, target_instance);
LPROC_SEQ_FOPS_RW_TYPE(ofd, ir_factor);
+LPROC_SEQ_FOPS_RW_TYPE(ofd, checksum_dump);
LPROC_SEQ_FOPS_RW_TYPE(ofd, job_interval);
+LPROC_SEQ_FOPS_RO(tgt_tot_dirty);
+LPROC_SEQ_FOPS_RO(tgt_tot_granted);
+LPROC_SEQ_FOPS_RO(tgt_tot_pending);
+LPROC_SEQ_FOPS(tgt_grant_compat_disable);
+
struct lprocfs_vars lprocfs_ofd_obd_vars[] = {
- { .name = "uuid",
- .fops = &ofd_uuid_fops },
- { .name = "blocksize",
- .fops = &ofd_blksize_fops },
- { .name = "kbytestotal",
- .fops = &ofd_kbytestotal_fops },
- { .name = "kbytesfree",
- .fops = &ofd_kbytesfree_fops },
- { .name = "kbytesavail",
- .fops = &ofd_kbytesavail_fops },
- { .name = "filestotal",
- .fops = &ofd_filestotal_fops },
- { .name = "filesfree",
- .fops = &ofd_filesfree_fops },
{ .name = "seqs_allocated",
.fops = &ofd_seqs_fops },
{ .name = "fstype",
{ .name = "last_id",
.fops = &ofd_last_id_fops },
{ .name = "tot_dirty",
- .fops = &ofd_tot_dirty_fops },
+ .fops = &tgt_tot_dirty_fops },
{ .name = "tot_pending",
- .fops = &ofd_tot_pending_fops },
+ .fops = &tgt_tot_pending_fops },
{ .name = "tot_granted",
- .fops = &ofd_tot_granted_fops },
+ .fops = &tgt_tot_granted_fops },
{ .name = "grant_precreate",
.fops = &ofd_grant_precreate_fops },
{ .name = "precreate_batch",
.fops = &ofd_target_instance_fops },
{ .name = "ir_factor",
.fops = &ofd_ir_factor_fops },
+ { .name = "checksum_dump",
+ .fops = &ofd_checksum_dump_fops },
{ .name = "grant_compat_disable",
- .fops = &ofd_grant_compat_disable_fops },
+ .fops = &tgt_grant_compat_disable_fops },
{ .name = "client_cache_count",
.fops = &ofd_fmd_max_num_fops },
{ .name = "client_cache_seconds",
git://git.whamcloud.com / fs / lustre-release.git / blobdiff