X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flmv%2Flproc_lmv.c;h=1f8b5a611914033c236d24f435ad9218df6ed36d;hb=6ac2f14f0f622863c330b8b96da9373bad1abeb5;hp=eea5927e0e756f25d1f09e06c6227e6704419985;hpb=bfa6343413c5c6423e96b6db387ae616d756a27f;p=fs%2Flustre-release.git

diff --git a/lustre/lmv/lproc_lmv.c b/lustre/lmv/lproc_lmv.c
index eea5927..1f8b5a6 100644
--- a/lustre/lmv/lproc_lmv.c
+++ b/lustre/lmv/lproc_lmv.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2004, 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/
@@ -42,7 +42,9 @@
 #include <lprocfs_status.h>
 #include <obd_class.h>
 
-#ifndef LPROCFS
+#include "lmv_internal.h"
+
+#ifndef CONFIG_PROC_FS
 static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
 #else
@@ -92,8 +94,9 @@ static int lmv_placement_seq_show(struct seq_file *m, void *v)
 
 #define MAX_POLICY_STRING_SIZE 64
 
-static ssize_t lmv_placement_seq_write(struct file *file, const char *buffer,
-					size_t count, loff_t *off)
+static ssize_t lmv_placement_seq_write(struct file *file,
+				       const char __user *buffer,
+				       size_t count, loff_t *off)
 {
 	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
         char                     dummy[MAX_POLICY_STRING_SIZE + 1];
@@ -175,11 +178,11 @@ static int lmv_tgt_seq_show(struct seq_file *p, void *v)
 
 	if (tgt == NULL)
 		return 0;
-	return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_idx,
+	return seq_printf(p, "%u: %s %sACTIVE\n", tgt->ltd_idx,
 			  tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
 }
 
-struct seq_operations lmv_tgt_sops = {
+static const struct seq_operations lmv_tgt_sops = {
         .start                 = lmv_tgt_seq_start,
         .stop                  = lmv_tgt_seq_stop,
         .next                  = lmv_tgt_seq_next,
@@ -202,13 +205,18 @@ static int lmv_target_seq_open(struct inode *inode, struct file *file)
 
 LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid);
 
-struct lprocfs_seq_vars lprocfs_lmv_obd_vars[] = {
-	{ "numobd",	&lmv_numobd_fops	},
-	{ "placement",	&lmv_placement_fops	},
-	{ "activeobd",	&lmv_activeobd_fops	},
-	{ "uuid",	&lmv_uuid_fops		},
-	{ "desc_uuid",	&lmv_desc_uuid_fops	},
-	{ 0 }
+struct lprocfs_vars lprocfs_lmv_obd_vars[] = {
+	{ .name	=	"numobd",
+	  .fops	=	&lmv_numobd_fops	},
+	{ .name	=	"placement",
+	  .fops	=	&lmv_placement_fops	},
+	{ .name	=	"activeobd",
+	  .fops	=	&lmv_activeobd_fops	},
+	{ .name	=	"uuid",
+	  .fops	=	&lmv_uuid_fops		},
+	{ .name	=	"desc_uuid",
+	  .fops	=	&lmv_desc_uuid_fops	},
+	{ NULL }
 };
 
 struct file_operations lmv_proc_target_fops = {
@@ -218,4 +226,4 @@ struct file_operations lmv_proc_target_fops = {
         .llseek               = seq_lseek,
         .release              = seq_release,
 };
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */