* Copyright 2008 Sun Microsystems, Inc. All rights reserved
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, LPU64"\n",
- lod->lod_desc.ld_default_stripe_size);
+ seq_printf(m, LPU64"\n",
+ lod->lod_desc.ld_default_stripe_size);
+ return 0;
}
/**
* \retval negative error code if failed
*/
static ssize_t
-lod_stripesize_seq_write(struct file *file, const char *buffer,
+lod_stripesize_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, LPU64"\n",
- lod->lod_desc.ld_default_stripe_offset);
+ seq_printf(m, LPU64"\n",
+ lod->lod_desc.ld_default_stripe_offset);
+ return 0;
}
/**
* \retval negative error code if failed
*/
static ssize_t
-lod_stripeoffset_seq_write(struct file *file, const char *buffer,
+lod_stripeoffset_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%u\n", lod->lod_desc.ld_pattern);
+ seq_printf(m, "%u\n", lod->lod_desc.ld_pattern);
+ return 0;
}
/**
* \retval negative error code if failed
*/
static ssize_t
-lod_stripetype_seq_write(struct file *file, const char *buffer,
+lod_stripetype_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%d\n",
- (__s16)(lod->lod_desc.ld_default_stripe_count + 1) - 1);
+ seq_printf(m, "%d\n",
+ (__s16)(lod->lod_desc.ld_default_stripe_count + 1) - 1);
+ return 0;
}
/**
* \retval negative error code otherwise
*/
static ssize_t
-lod_stripecount_seq_write(struct file *file, const char *buffer,
+lod_stripecount_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%u\n", lod->lod_desc.ld_tgt_count);
+ seq_printf(m, "%u\n", lod->lod_desc.ld_tgt_count);
+ return 0;
}
LPROC_SEQ_FOPS_RO(lod_numobd);
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%u\n", lod->lod_desc.ld_active_tgt_count);
+ seq_printf(m, "%u\n", lod->lod_desc.ld_active_tgt_count);
+ return 0;
}
LPROC_SEQ_FOPS_RO(lod_activeobd);
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%s\n", lod->lod_desc.ld_uuid.uuid);
+ seq_printf(m, "%s\n", lod->lod_desc.ld_uuid.uuid);
+ return 0;
}
LPROC_SEQ_FOPS_RO(lod_desc_uuid);
struct lod_device *lod = lu2lod_dev(dev->obd_lu_dev);
LASSERT(lod != NULL);
- return seq_printf(m, "%d%%\n",
- (lod->lod_qos.lq_prio_free * 100 + 255) >> 8);
+ seq_printf(m, "%d%%\n",
+ (lod->lod_qos.lq_prio_free * 100 + 255) >> 8);
+ return 0;
}
/**
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%d%%\n",
- (lod->lod_qos.lq_threshold_rr * 100 + 255) >> 8);
+ seq_printf(m, "%d%%\n",
+ (lod->lod_qos.lq_threshold_rr * 100 + 255) >> 8);
+ return 0;
}
/**
* \retval negative error code if failed
*/
static ssize_t
-lod_qos_thresholdrr_seq_write(struct file *file, const char *buffer,
+lod_qos_thresholdrr_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%u Sec\n", lod->lod_desc.ld_qos_maxage);
+ seq_printf(m, "%u Sec\n", lod->lod_desc.ld_qos_maxage);
+ return 0;
}
/**
* \retval negative error code if failed
*/
static ssize_t
-lod_qos_maxage_seq_write(struct file *file, const char *buffer,
+lod_qos_maxage_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
} else if (rc)
return rc;
- return seq_printf(p, "%d: %s %sACTIVE\n", idx,
- obd_uuid2str(&ost_desc->ltd_uuid),
- active ? "" : "IN");
+ seq_printf(p, "%d: %s %sACTIVE\n", idx,
+ obd_uuid2str(&ost_desc->ltd_uuid),
+ active ? "" : "IN");
+ return 0;
}
static const struct seq_operations lod_osts_sops = {
LASSERT(dev != NULL);
lod = lu2lod_dev(dev->obd_lu_dev);
- return seq_printf(m, "%d\n", lod->lod_lmv_failout ? 1 : 0);
+ seq_printf(m, "%d\n", lod->lod_lmv_failout ? 1 : 0);
+ return 0;
}
/**
* \retval negative error code if failed
*/
static ssize_t
-lod_lmv_failout_seq_write(struct file *file, const char *buffer,
+lod_lmv_failout_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
}
LPROC_SEQ_FOPS(lod_lmv_failout);
-static struct lprocfs_seq_vars lprocfs_lod_obd_vars[] = {
+static struct lprocfs_vars lprocfs_lod_obd_vars[] = {
{ .name = "uuid",
.fops = &lod_uuid_fops },
{ .name = "stripesize",
{ NULL }
};
-static struct lprocfs_seq_vars lprocfs_lod_osd_vars[] = {
+static struct lprocfs_vars lprocfs_lod_osd_vars[] = {
{ "blocksize", &lod_dt_blksize_fops },
{ "kbytestotal", &lod_dt_kbytestotal_fops },
{ "kbytesfree", &lod_dt_kbytesfree_fops },
RETURN(rc);
}
- rc = lprocfs_seq_add_vars(obd->obd_proc_entry, lprocfs_lod_osd_vars,
- &lod->lod_dt_dev);
+ rc = lprocfs_add_vars(obd->obd_proc_entry, lprocfs_lod_osd_vars,
+ &lod->lod_dt_dev);
if (rc) {
CERROR("%s: cannot setup procfs entry: %d\n",
obd->obd_name, rc);
GOTO(out, rc);
}
- lod->lod_pool_proc_entry = lprocfs_seq_register("pools",
- obd->obd_proc_entry,
- NULL, NULL);
+ lod->lod_pool_proc_entry = lprocfs_register("pools",
+ obd->obd_proc_entry,
+ NULL, NULL);
if (IS_ERR(lod->lod_pool_proc_entry)) {
rc = PTR_ERR(lod->lod_pool_proc_entry);
lod->lod_pool_proc_entry = NULL;
{
struct obd_device *obd = lod2obd(lod);
- if (lod->lod_symlink != NULL)
+ if (lod->lod_symlink != NULL) {
lprocfs_remove(&lod->lod_symlink);
+ lod->lod_symlink = NULL;
+ }
if (lod->lod_pool_proc_entry != NULL) {
lprocfs_remove(&lod->lod_pool_proc_entry);