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-6245 tests: remove libcfs.h from test applications
[fs/lustre-release.git]
/
lustre
/
lmv
/
lproc_lmv.c
diff --git
a/lustre/lmv/lproc_lmv.c
b/lustre/lmv/lproc_lmv.c
index
de2a6f3
..
1f8b5a6
100644
(file)
--- 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) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
3
, Intel Corporation.
+ * Copyright (c) 2012, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-42,7
+42,9
@@
#include <lprocfs_status.h>
#include <obd_class.h>
#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
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
#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];
{
struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
char dummy[MAX_POLICY_STRING_SIZE + 1];
@@
-179,7
+182,7
@@
static int lmv_tgt_seq_show(struct seq_file *p, void *v)
tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
}
tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
}
-struct seq_operations lmv_tgt_sops = {
+st
atic const st
ruct seq_operations lmv_tgt_sops = {
.start = lmv_tgt_seq_start,
.stop = lmv_tgt_seq_stop,
.next = lmv_tgt_seq_next,
.start = lmv_tgt_seq_start,
.stop = lmv_tgt_seq_stop,
.next = lmv_tgt_seq_next,
@@
-202,7
+205,7
@@
static int lmv_target_seq_open(struct inode *inode, struct file *file)
LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid);
LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid);
-struct lprocfs_
seq_
vars lprocfs_lmv_obd_vars[] = {
+struct lprocfs_vars lprocfs_lmv_obd_vars[] = {
{ .name = "numobd",
.fops = &lmv_numobd_fops },
{ .name = "placement",
{ .name = "numobd",
.fops = &lmv_numobd_fops },
{ .name = "placement",
@@
-213,7
+216,7
@@
struct lprocfs_seq_vars lprocfs_lmv_obd_vars[] = {
.fops = &lmv_uuid_fops },
{ .name = "desc_uuid",
.fops = &lmv_desc_uuid_fops },
.fops = &lmv_uuid_fops },
{ .name = "desc_uuid",
.fops = &lmv_desc_uuid_fops },
- {
0
}
+ {
NULL
}
};
struct file_operations lmv_proc_target_fops = {
};
struct file_operations lmv_proc_target_fops = {
@@
-223,4
+226,4
@@
struct file_operations lmv_proc_target_fops = {
.llseek = seq_lseek,
.release = seq_release,
};
.llseek = seq_lseek,
.release = seq_release,
};
-#endif /*
LPROC
FS */
+#endif /*
CONFIG_PROC_
FS */