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-8066 obd: fix LPROC_SEQ_FOPS macros for debugfs
[fs/lustre-release.git]
/
lustre
/
osd-ldiskfs
/
osd_lproc.c
diff --git
a/lustre/osd-ldiskfs/osd_lproc.c
b/lustre/osd-ldiskfs/osd_lproc.c
index
18a01a8
..
5a3c703
100644
(file)
--- a/
lustre/osd-ldiskfs/osd_lproc.c
+++ b/
lustre/osd-ldiskfs/osd_lproc.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,7
+23,7
@@
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
4
, Intel Corporation.
+ * Copyright (c) 2011, 201
5
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-41,7
+37,6
@@
#define DEBUG_SUBSYSTEM S_OSD
#include <lprocfs_status.h>
#define DEBUG_SUBSYSTEM S_OSD
#include <lprocfs_status.h>
-#include <lustre/lustre_idl.h>
#include "osd_internal.h"
#include "osd_internal.h"
@@
-63,7
+58,7
@@
void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf)
if (unlikely(nr_pages == 0))
return;
if (unlikely(nr_pages == 0))
return;
- blocks_per_page = PAGE_
CACHE_
SIZE >> osd_sb(osd)->s_blocksize_bits;
+ blocks_per_page = PAGE_SIZE >> osd_sb(osd)->s_blocksize_bits;
lprocfs_oh_tally_log2(&s->hist[BRW_R_PAGES+rw], nr_pages);
lprocfs_oh_tally_log2(&s->hist[BRW_R_PAGES+rw], nr_pages);
@@
-125,12
+120,13
@@
static void display_brw_stats(struct seq_file *seq, char *name, char *units,
static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
{
static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
{
- struct time
val
now;
+ struct time
spec64
now;
/* this sampling races with updates */
/* this sampling races with updates */
- do_gettimeofday(&now);
- seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n",
- now.tv_sec, now.tv_usec);
+ ktime_get_real_ts64(&now);
+
+ seq_printf(seq, "snapshot_time: %lld.%09ld (secs.nsecs)\n",
+ (s64)now.tv_sec, now.tv_nsec);
display_brw_stats(seq, "pages per bulk r/w", "rpcs",
&brw_stats->hist[BRW_R_PAGES],
display_brw_stats(seq, "pages per bulk r/w", "rpcs",
&brw_stats->hist[BRW_R_PAGES],
@@
-173,10
+169,11
@@
static int osd_brw_stats_seq_show(struct seq_file *seq, void *v)
return 0;
}
return 0;
}
-static ssize_t osd_brw_stats_seq_write(struct file *file, const char *buf,
- size_t len, loff_t *off)
+static ssize_t osd_brw_stats_seq_write(struct file *file,
+ const char __user *buf,
+ size_t len, loff_t *off)
{
{
-
struct seq_file *seq = file->private_data;
+ struct seq_file *seq = file->private_data;
struct osd_device *osd = seq->private;
int i;
struct osd_device *osd = seq->private;
int i;
@@
-243,7
+240,8
@@
static int ldiskfs_osd_fstype_seq_show(struct seq_file *m, void *data)
struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
LASSERT(osd != NULL);
struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
LASSERT(osd != NULL);
- return seq_printf(m, "ldiskfs\n");
+ seq_puts(m, "ldiskfs\n");
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_fstype);
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_fstype);
@@
-255,7
+253,8
@@
static int ldiskfs_osd_mntdev_seq_show(struct seq_file *m, void *data)
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%s\n", osd->od_mntdev);
+ seq_printf(m, "%s\n", osd->od_mntdev);
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_mntdev);
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_mntdev);
@@
-267,23
+266,25
@@
static int ldiskfs_osd_cache_seq_show(struct seq_file *m, void *data)
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%u\n", osd->od_read_cache);
+ seq_printf(m, "%u\n", osd->od_read_cache);
+ return 0;
}
static ssize_t
}
static ssize_t
-ldiskfs_osd_cache_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_cache_seq_write(struct file *file, const char
__user
*buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- struct seq_file
*m = file->private_data;
- struct dt_device
*dt = m->private;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
struct osd_device *osd = osd_dt_dev(dt);
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc)
return rc;
if (rc)
return rc;
@@
-300,23
+301,25
@@
static int ldiskfs_osd_wcache_seq_show(struct seq_file *m, void *data)
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%u\n", osd->od_writethrough_cache);
+ seq_printf(m, "%u\n", osd->od_writethrough_cache);
+ return 0;
}
static ssize_t
}
static ssize_t
-ldiskfs_osd_wcache_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_wcache_seq_write(struct file *file, const char
__user
*buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- struct seq_file
*m = file->private_data;
- struct dt_device
*dt = m->private;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
struct osd_device *osd = osd_dt_dev(dt);
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc)
return rc;
if (rc)
return rc;
@@
-326,7
+329,7
@@
ldiskfs_osd_wcache_seq_write(struct file *file, const char *buffer,
LPROC_SEQ_FOPS(ldiskfs_osd_wcache);
static ssize_t
LPROC_SEQ_FOPS(ldiskfs_osd_wcache);
static ssize_t
-lprocfs_osd_force_sync_seq_write(struct file *file, const char *buffer,
+lprocfs_osd_force_sync_seq_write(struct file *file, const char
__user
*buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
@@
-347,26
+350,28
@@
lprocfs_osd_force_sync_seq_write(struct file *file, const char *buffer,
return rc == 0 ? count : rc;
}
return rc == 0 ? count : rc;
}
-LPROC_SEQ_FOPS_W
O_TYPE
(ldiskfs, osd_force_sync);
+LPROC_SEQ_FOPS_W
R_ONLY
(ldiskfs, osd_force_sync);
static int ldiskfs_osd_pdo_seq_show(struct seq_file *m, void *data)
{
static int ldiskfs_osd_pdo_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+ seq_printf(m, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+ return 0;
}
static ssize_t
}
static ssize_t
-ldiskfs_osd_pdo_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_pdo_seq_write(struct file *file, const char
__user
*buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- int pdo, rc;
+ int rc;
+ __s64 pdo;
-
rc = lprocfs_write_helper
(buffer, count, &pdo);
-
if (rc != 0)
-
return rc;
+
rc = lprocfs_str_to_s64
(buffer, count, &pdo);
+ if (rc != 0)
+ return rc;
-
ldiskfs_pdo = !!pdo;
+ ldiskfs_pdo = !!pdo;
-
return count;
+ return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_pdo);
}
LPROC_SEQ_FOPS(ldiskfs_osd_pdo);
@@
-378,23
+383,25
@@
static int ldiskfs_osd_auto_scrub_seq_show(struct seq_file *m, void *data)
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%d\n", !dev->od_noscrub);
+ seq_printf(m, "%d\n", !dev->od_noscrub);
+ return 0;
}
static ssize_t
}
static ssize_t
-ldiskfs_osd_auto_scrub_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_auto_scrub_seq_write(struct file *file, const char
__user
*buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- struct seq_file
*m = file->private_data;
- struct dt_device
*dt = m->private;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
struct osd_device *dev = osd_dt_dev(dt);
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc)
return rc;
if (rc)
return rc;
@@
-411,23
+418,26
@@
static int ldiskfs_osd_full_scrub_ratio_seq_show(struct seq_file *m, void *data)
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64"\n", dev->od_full_scrub_ratio);
+ seq_printf(m, "%llu\n", dev->od_full_scrub_ratio);
+ return 0;
}
static ssize_t
}
static ssize_t
-ldiskfs_osd_full_scrub_ratio_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_full_scrub_ratio_seq_write(struct file *file,
+ const char __user *buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- struct seq_file
*m = file->private_data;
- struct dt_device
*dt = m->private;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
struct osd_device *dev = osd_dt_dev(dt);
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc != 0)
return rc;
if (rc != 0)
return rc;
@@
-448,25
+458,27
@@
static int ldiskfs_osd_full_scrub_threshold_rate_seq_show(struct seq_file *m,
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64" (bad OI mappings/minute)\n",
- dev->od_full_scrub_threshold_rate);
+ seq_printf(m, "%llu (bad OI mappings/minute)\n",
+ dev->od_full_scrub_threshold_rate);
+ return 0;
}
static ssize_t
ldiskfs_osd_full_scrub_threshold_rate_seq_write(struct file *file,
}
static ssize_t
ldiskfs_osd_full_scrub_threshold_rate_seq_write(struct file *file,
- const char *buffer,
+ const char
__user
*buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- struct seq_file
*m = file->private_data;
- struct dt_device
*dt = m->private;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
struct osd_device *dev = osd_dt_dev(dt);
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc != 0)
return rc;
if (rc != 0)
return rc;
@@
-481,18
+493,19
@@
LPROC_SEQ_FOPS(ldiskfs_osd_full_scrub_threshold_rate);
static int
ldiskfs_osd_track_declares_assert_seq_show(struct seq_file *m, void *data)
{
static int
ldiskfs_osd_track_declares_assert_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%d\n", ldiskfs_track_declares_assert);
+ seq_printf(m, "%d\n", ldiskfs_track_declares_assert);
+ return 0;
}
static ssize_t
ldiskfs_osd_track_declares_assert_seq_write(struct file *file,
}
static ssize_t
ldiskfs_osd_track_declares_assert_seq_write(struct file *file,
- const char *buffer,
+ const char
__user
*buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
-
int
track_declares_assert;
- int
rc;
+
__s64
track_declares_assert;
+ int rc;
- rc = lprocfs_
write_helper
(buffer, count, &track_declares_assert);
+ rc = lprocfs_
str_to_s64
(buffer, count, &track_declares_assert);
if (rc != 0)
return rc;
if (rc != 0)
return rc;
@@
-522,26
+535,29
@@
static int ldiskfs_osd_readcache_seq_show(struct seq_file *m, void *data)
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64"\n", osd->od_readcache_max_filesize);
+ seq_printf(m, "%llu\n", osd->od_readcache_max_filesize);
+ return 0;
}
static ssize_t
}
static ssize_t
-ldiskfs_osd_readcache_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_readcache_seq_write(struct file *file, const char
__user
*buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- struct seq_file
*m = file->private_data;
- struct dt_device
*dt = m->private;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
struct osd_device *osd = osd_dt_dev(dt);
- __
u64
val;
- int
rc;
+ __
s64
val;
+ int rc;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_
write_u64_helper(buffer, count, &val
);
+ rc = lprocfs_
str_with_units_to_s64(buffer, count, &val, '1'
);
if (rc)
return rc;
if (rc)
return rc;
+ if (val < 0)
+ return -ERANGE;
osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ?
OSD_MAX_CACHE_SIZE : val;
osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ?
OSD_MAX_CACHE_SIZE : val;
@@
-558,26
+574,28
@@
static int ldiskfs_osd_index_in_idif_seq_show(struct seq_file *m, void *data)
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%d\n", (int)(dev->od_index_in_idif));
+ seq_printf(m, "%d\n", (int)(dev->od_index_in_idif));
+ return 0;
}
static ssize_t
}
static ssize_t
-ldiskfs_osd_index_in_idif_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_index_in_idif_seq_write(struct file *file,
+ const char __user *buffer,
size_t count, loff_t *off)
{
size_t count, loff_t *off)
{
- struct lu_env
env;
- struct seq_file
*m
= file->private_data;
- struct dt_device
*dt
= m->private;
- struct osd_device
*dev
= osd_dt_dev(dt);
- struct lu_target
*tgt;
-
int
val;
- int
rc;
+ struct lu_env env;
+ struct seq_file
*m
= file->private_data;
+ struct dt_device
*dt
= m->private;
+ struct osd_device
*dev
= osd_dt_dev(dt);
+ struct lu_target *tgt;
+
__s64
val;
+ int rc;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc != 0)
return rc;
if (rc != 0)
return rc;