Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-8102 ldlm: Correlate ptlrpc req w/AST error
[fs/lustre-release.git]
/
lustre
/
mdd
/
mdd_lproc.c
diff --git
a/lustre/mdd/mdd_lproc.c
b/lustre/mdd/mdd_lproc.c
index
c09ee9c
..
099fc1a
100644
(file)
--- a/
lustre/mdd/mdd_lproc.c
+++ b/
lustre/mdd/mdd_lproc.c
@@
-78,7
+78,8
@@
static int mdd_atime_diff_seq_show(struct seq_file *m, void *data)
{
struct mdd_device *mdd = m->private;
- return seq_printf(m, "%lu\n", mdd->mdd_atime_diff);
+ seq_printf(m, "%lu\n", mdd->mdd_atime_diff);
+ return 0;
}
LPROC_SEQ_FOPS(mdd_atime_diff);
@@
-177,12
+178,64
@@
static int mdd_changelog_users_seq_show(struct seq_file *m, void *data)
}
LPROC_SEQ_FOPS_RO(mdd_changelog_users);
+static int mdd_changelog_size_ctxt(const struct lu_env *env,
+ struct mdd_device *mdd,
+ int index, __u64 *val)
+{
+ struct llog_ctxt *ctxt;
+
+ ctxt = llog_get_context(mdd2obd_dev(mdd),
+ index);
+ if (ctxt == NULL)
+ return -ENXIO;
+
+ if (!(ctxt->loc_handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT)) {
+ CERROR("%s: ChangeLog has wrong flags: rc = %d\n",
+ ctxt->loc_obd->obd_name, -EINVAL);
+ llog_ctxt_put(ctxt);
+ return -EINVAL;
+ }
+
+ *val += llog_cat_size(env, ctxt->loc_handle);
+
+ llog_ctxt_put(ctxt);
+
+ return 0;
+}
+
+static int mdd_changelog_size_seq_show(struct seq_file *m, void *data)
+{
+ struct lu_env env;
+ struct mdd_device *mdd = m->private;
+ __u64 tmp = 0;
+ int rc;
+
+ rc = lu_env_init(&env, LCT_LOCAL);
+ if (rc)
+ return rc;
+
+ rc = mdd_changelog_size_ctxt(&env, mdd, LLOG_CHANGELOG_ORIG_CTXT, &tmp);
+ if (rc) {
+ lu_env_fini(&env);
+ return rc;
+ }
+
+ rc = mdd_changelog_size_ctxt(&env, mdd, LLOG_CHANGELOG_USER_ORIG_CTXT,
+ &tmp);
+
+ seq_printf(m, LPU64"\n", tmp);
+ lu_env_fini(&env);
+ return rc;
+}
+LPROC_SEQ_FOPS_RO(mdd_changelog_size);
+
static int mdd_sync_perm_seq_show(struct seq_file *m, void *data)
{
struct mdd_device *mdd = m->private;
LASSERT(mdd != NULL);
- return seq_printf(m, "%d\n", mdd->mdd_sync_permission);
+ seq_printf(m, "%d\n", mdd->mdd_sync_permission);
+ return 0;
}
static ssize_t
@@
-191,15
+244,17
@@
mdd_sync_perm_seq_write(struct file *file, const char __user *buffer,
{
struct seq_file *m = file->private_data;
struct mdd_device *mdd = m->private;
- int val, rc;
+ int rc;
+ __s64 val;
-
LASSERT(mdd != NULL);
-
rc = lprocfs_write_helper
(buffer, count, &val);
-
if (rc)
-
return rc;
+ LASSERT(mdd != NULL);
+
rc = lprocfs_str_to_s64
(buffer, count, &val);
+ if (rc)
+ return rc;
- mdd->mdd_sync_permission = !!val;
- return count;
+ mdd->mdd_sync_permission = !!val;
+
+ return count;
}
LPROC_SEQ_FOPS(mdd_sync_perm);
@@
-217,13
+272,15
@@
mdd_lfsck_speed_limit_seq_write(struct file *file, const char __user *buffer,
{
struct seq_file *m = file->private_data;
struct mdd_device *mdd = m->private;
- __
u32
val;
+ __
s64
val;
int rc;
LASSERT(mdd != NULL);
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc != 0)
return rc;
+ if (val < 0 || val > INT_MAX)
+ return -ERANGE;
rc = lfsck_set_speed(mdd->mdd_bottom, val);
return rc != 0 ? rc : count;
@@
-244,13
+301,17
@@
mdd_lfsck_async_windows_seq_write(struct file *file, const char __user *buffer,
{
struct seq_file *m = file->private_data;
struct mdd_device *mdd = m->private;
- __
u32
val;
+ __
s64
val;
int rc;
LASSERT(mdd != NULL);
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc == 0)
- rc = lfsck_set_windows(mdd->mdd_bottom, val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
+ if (rc)
+ return rc;
+ if (val < 0 || val > INT_MAX)
+ return -ERANGE;
+
+ rc = lfsck_set_windows(mdd->mdd_bottom, val);
return rc != 0 ? rc : count;
}
@@
-283,6
+344,8
@@
static struct lprocfs_vars lprocfs_mdd_obd_vars[] = {
.fops = &mdd_changelog_mask_fops },
{ .name = "changelog_users",
.fops = &mdd_changelog_users_fops },
+ { .name = "changelog_size",
+ .fops = &mdd_changelog_size_fops },
{ .name = "sync_permission",
.fops = &mdd_sync_perm_fops },
{ .name = "lfsck_speed_limit",