X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lproc.c;h=099fc1a60ffa3fbb2d195cb4dc560c4762ba57b4;hb=abf0e13bf261ec949ed32368296388df73c6ca72;hp=ca527716534b9eb8d10cc0d7b1c4788330824586;hpb=b1e595c09e1b07a6840142b3ae015b8a5a8affeb;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lproc.c b/lustre/mdd/mdd_lproc.c
index ca52771..099fc1a 100644
--- a/lustre/mdd/mdd_lproc.c
+++ b/lustre/mdd/mdd_lproc.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -50,7 +50,7 @@
 #include "mdd_internal.h"
 
 static ssize_t
-mdd_atime_diff_seq_write(struct file *file, const char *buffer,
+mdd_atime_diff_seq_write(struct file *file, const char __user *buffer,
 			 size_t count, loff_t *off)
 {
 	struct seq_file *m = file->private_data;
@@ -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);
 
@@ -97,7 +98,7 @@ static int mdd_changelog_mask_seq_show(struct seq_file *m, void *data)
 }
 
 static ssize_t
-mdd_changelog_mask_seq_write(struct file *file, const char *buffer,
+mdd_changelog_mask_seq_write(struct file *file, const char __user *buffer,
 			     size_t count, loff_t *off)
 {
 	struct seq_file *m = file->private_data;
@@ -177,29 +178,83 @@ 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
-mdd_sync_perm_seq_write(struct file *file, const char *buffer,
+mdd_sync_perm_seq_write(struct file *file, const char __user *buffer,
 			size_t count, loff_t *off)
 {
 	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);
 
@@ -212,18 +267,20 @@ static int mdd_lfsck_speed_limit_seq_show(struct seq_file *m, void *data)
 }
 
 static ssize_t
-mdd_lfsck_speed_limit_seq_write(struct file *file, const char *buffer,
+mdd_lfsck_speed_limit_seq_write(struct file *file, const char __user *buffer,
 				size_t count, loff_t *off)
 {
 	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;
@@ -239,18 +296,22 @@ static int mdd_lfsck_async_windows_seq_show(struct seq_file *m, void *data)
 }
 
 static ssize_t
-mdd_lfsck_async_windows_seq_write(struct file *file, const char *buffer,
+mdd_lfsck_async_windows_seq_write(struct file *file, const char __user *buffer,
 				  size_t count, loff_t *off)
 {
 	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;
 }
@@ -276,13 +337,15 @@ static int mdd_lfsck_layout_seq_show(struct seq_file *m, void *data)
 }
 LPROC_SEQ_FOPS_RO(mdd_lfsck_layout);
 
-static struct lprocfs_seq_vars lprocfs_mdd_obd_vars[] = {
+static struct lprocfs_vars lprocfs_mdd_obd_vars[] = {
 	{ .name =	"atime_diff",
 	  .fops =	&mdd_atime_diff_fops		},
 	{ .name =	"changelog_mask",
 	  .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",
@@ -293,12 +356,12 @@ static struct lprocfs_seq_vars lprocfs_mdd_obd_vars[] = {
 	  .fops =	&mdd_lfsck_namespace_fops	},
 	{ .name	=	"lfsck_layout",
 	  .fops	=	&mdd_lfsck_layout_fops		},
-	{ 0 }
+	{ NULL }
 };
 
 int mdd_procfs_init(struct mdd_device *mdd, const char *name)
 {
-	struct obd_device *obd = class_name2obd(name);
+	struct obd_device *obd = mdd2obd_dev(mdd);
 	struct obd_type   *type;
 	int		   rc;
 	ENTRY;
@@ -313,8 +376,8 @@ int mdd_procfs_init(struct mdd_device *mdd, const char *name)
 
 	/* Find the type procroot and add the proc entry for this device */
 	obd->obd_vars = lprocfs_mdd_obd_vars;
-	mdd->mdd_proc_entry = lprocfs_seq_register(name, type->typ_procroot,
-						   obd->obd_vars, mdd);
+	mdd->mdd_proc_entry = lprocfs_register(name, type->typ_procroot,
+					       obd->obd_vars, mdd);
 	if (IS_ERR(mdd->mdd_proc_entry)) {
 		rc = PTR_ERR(mdd->mdd_proc_entry);
 		CERROR("Error %d setting up lprocfs for %s\n",