*
* 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
*/
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <lustre_fid.h>
#include <lprocfs_status.h>
#include "fid_internal.h"
-#include <md_object.h>
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
+
+/* Format: [0x64BIT_INT - 0x64BIT_INT] + 32 bytes just in case */
+#define MAX_FID_RANGE_STRLEN (32 + 2 * 2 * sizeof(__u64))
/**
* Reduce the SEQ range allocated to a node to a strict subset of the range
* currently-allocated SEQ range. If the specified range is "clear", then
* safe for production use.
*/
static int
-lprocfs_fid_write_common(const char *buffer, unsigned long count,
+lprocfs_fid_write_common(const char __user *buffer, size_t count,
struct lu_seq_range *range)
{
- struct lu_seq_range tmp = { 0, };
- int rc;
+ struct lu_seq_range tmp = {
+ .lsr_start = 0,
+ };
+ char kernbuf[MAX_FID_RANGE_STRLEN];
ENTRY;
LASSERT(range != NULL);
- if (count == 5 && strcmp(buffer, "clear") == 0) {
+ if (count >= sizeof(kernbuf))
+ RETURN(-EINVAL);
+
+ if (copy_from_user(kernbuf, buffer, count))
+ RETURN(-EFAULT);
+
+ kernbuf[count] = 0;
+
+ if (count == 5 && strcmp(kernbuf, "clear") == 0) {
memset(range, 0, sizeof(*range));
RETURN(0);
}
/* of the form "[0x0000000240000400 - 0x000000028000400]" */
- rc = sscanf(buffer, "[%llx - %llx]\n",
- (long long unsigned *)&tmp.lsr_start,
- (long long unsigned *)&tmp.lsr_end);
- if (!range_is_sane(&tmp) || range_is_zero(&tmp) ||
+ sscanf(kernbuf, "[%llx - %llx]\n",
+ (long long unsigned *)&tmp.lsr_start,
+ (long long unsigned *)&tmp.lsr_end);
+ if (!lu_seq_range_is_sane(&tmp) || lu_seq_range_is_zero(&tmp) ||
tmp.lsr_start < range->lsr_start || tmp.lsr_end > range->lsr_end)
RETURN(-EINVAL);
*range = tmp;
* Server side procfs stuff.
*/
static ssize_t
-lprocfs_server_fid_space_seq_write(struct file *file, const char *buffer,
+lprocfs_server_fid_space_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct lu_server_seq *seq = ((struct seq_file *)file->private_data)->private;
lprocfs_server_fid_space_seq_show(struct seq_file *m, void *unused)
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
- rc = seq_printf(m, "["LPX64" - "LPX64"]:%x:%s\n",
- PRANGE(&seq->lss_space));
+ seq_printf(m, "[%#llx - %#llx]:%x:%s\n", PRANGE(&seq->lss_space));
mutex_unlock(&seq->lss_mutex);
- RETURN(rc);
+ RETURN(0);
}
static int
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
struct client_obd *cli;
- int rc;
ENTRY;
LASSERT(seq != NULL);
if (seq->lss_cli) {
if (seq->lss_cli->lcs_exp != NULL) {
cli = &seq->lss_cli->lcs_exp->exp_obd->u.cli;
- rc = seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
+ seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
} else {
- rc = seq_printf(m, "%s\n",
- seq->lss_cli->lcs_srv->lss_name);
+ seq_printf(m, "%s\n", seq->lss_cli->lcs_srv->lss_name);
}
} else {
- rc = seq_printf(m, "<none>\n");
+ seq_puts(m, "<none>\n");
}
- RETURN(rc);
+ RETURN(0);
}
static ssize_t
-lprocfs_server_fid_width_seq_write(struct file *file, const char *buffer,
+lprocfs_server_fid_width_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct lu_server_seq *seq = ((struct seq_file *)file->private_data)->private;
- int rc, val;
+ int rc;
+ __s64 val;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc != 0) {
- CERROR("%s: invalid width.\n", seq->lss_name);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
+ if (rc) {
+ CERROR("%s: invalid FID sequence width: rc = %d\n",
+ seq->lss_name, rc);
GOTO(out_unlock, count = rc);
}
+ if (val < 0) {
+ CERROR("%s: invalid FID sequence width: rc = %d\n",
+ seq->lss_name, -ERANGE);
+ GOTO(out_unlock, count = -ERANGE);
+ }
+
seq->lss_width = val;
- CDEBUG(D_INFO, "%s: Width: "LPU64"\n",
+ CDEBUG(D_INFO, "%s: Width: %llu\n",
seq->lss_name, seq->lss_width);
out_unlock:
mutex_unlock(&seq->lss_mutex);
lprocfs_server_fid_width_seq_show(struct seq_file *m, void *unused)
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
- rc = seq_printf(m, LPU64"\n", seq->lss_width);
+ seq_printf(m, "%llu\n", seq->lss_width);
mutex_unlock(&seq->lss_mutex);
- RETURN(rc);
+ RETURN(0);
}
LPROC_SEQ_FOPS(lprocfs_server_fid_space);
LPROC_SEQ_FOPS(lprocfs_server_fid_width);
LPROC_SEQ_FOPS_RO(lprocfs_server_fid_server);
-struct lprocfs_seq_vars seq_server_proc_list[] = {
- { "space", &lprocfs_server_fid_space_fops },
- { "width", &lprocfs_server_fid_width_fops },
- { "server", &lprocfs_server_fid_server_fops },
+struct lprocfs_vars seq_server_proc_list[] = {
+ { .name = "space",
+ .fops = &lprocfs_server_fid_space_fops },
+ { .name = "width",
+ .fops = &lprocfs_server_fid_width_fops },
+ { .name = "server",
+ .fops = &lprocfs_server_fid_server_fops },
{ NULL }
};
fld->lsf_name, rc);
} else if (fld_rec.lsr_start != 0) {
range_be_to_cpu(&fld_rec, &fld_rec);
- rc = seq_printf(p, DRANGE"\n", PRANGE(&fld_rec));
+ seq_printf(p, DRANGE"\n", PRANGE(&fld_rec));
}
return rc;
fld = ss->lss_site->ss_server_fld;
LASSERT(fld != NULL);
- LPROCFS_ENTRY_CHECK(PDE(inode));
+ rc = LPROCFS_ENTRY_CHECK(inode);
+ if (rc < 0)
+ return rc;
+
rc = seq_open(file, &fldb_sops);
if (rc)
return rc;
env_init = 1;
iops = &obj->do_index_ops->dio_it;
- param->fsp_it = iops->init(¶m->fsp_env, obj, 0, NULL);
+ param->fsp_it = iops->init(¶m->fsp_env, obj, 0);
if (IS_ERR(param->fsp_it))
GOTO(out, rc = PTR_ERR(param->fsp_it));
return 0;
}
-static ssize_t fldb_seq_write(struct file *file, const char *buf,
+static ssize_t fldb_seq_write(struct file *file, const char __user *buf,
size_t len, loff_t *off)
{
struct seq_file *seq = file->private_data;
struct fld_seq_param *param;
struct lu_seq_range range;
int rc = 0;
- char *buffer, *_buffer;
+ char _buffer[MAX_FID_RANGE_STRLEN];
+ char *buffer = _buffer;
ENTRY;
param = seq->private;
if (param == NULL)
RETURN(-EINVAL);
- OBD_ALLOC(buffer, len + 1);
- if (buffer == NULL)
- RETURN(-ENOMEM);
- memcpy(buffer, buf, len);
+ if (len >= sizeof(_buffer))
+ RETURN(-EINVAL);
+
+ if (copy_from_user(buffer, buf, len))
+ GOTO(out, rc = -EFAULT);
buffer[len] = 0;
- _buffer = buffer;
/*
* format - [0x0000000200000007-0x0000000200000008):0:mdt
&range, ¶m->fsp_env);
out:
- OBD_FREE(_buffer, len + 1);
RETURN(rc < 0 ? rc : len);
}
/* Client side procfs stuff */
static ssize_t
-lprocfs_client_fid_space_seq_write(struct file *file, const char *buffer,
+lprocfs_client_fid_space_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private;
lprocfs_client_fid_space_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
- rc = seq_printf(m, "["LPX64" - "LPX64"]:%x:%s\n",
- PRANGE(&seq->lcs_space));
+ seq_printf(m, "[%#llx - %#llx]:%x:%s\n",
+ PRANGE(&seq->lcs_space));
mutex_unlock(&seq->lcs_mutex);
- RETURN(rc);
+ RETURN(0);
}
static ssize_t
-lprocfs_client_fid_width_seq_write(struct file *file, const char *buffer,
+lprocfs_client_fid_width_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private;
- __u64 max;
- int rc, val;
+ __u64 max;
+ int rc;
+ __s64 val;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
if (rc) {
- mutex_unlock(&seq->lcs_mutex);
- RETURN(rc);
+ GOTO(out_unlock, count = rc);
}
if (seq->lcs_type == LUSTRE_SEQ_DATA)
if (val <= max && val > 0) {
seq->lcs_width = val;
- if (rc == 0) {
- CDEBUG(D_INFO, "%s: Sequence size: "LPU64"\n",
- seq->lcs_name, seq->lcs_width);
- }
+ CDEBUG(D_INFO, "%s: Sequence size: %llu\n",
+ seq->lcs_name, seq->lcs_width);
+ } else {
+ GOTO(out_unlock, count = -ERANGE);
}
- mutex_unlock(&seq->lcs_mutex);
+out_unlock:
+ mutex_unlock(&seq->lcs_mutex);
RETURN(count);
}
lprocfs_client_fid_width_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
- rc = seq_printf(m, LPU64"\n", seq->lcs_width);
+ seq_printf(m, "%llu\n", seq->lcs_width);
mutex_unlock(&seq->lcs_mutex);
- RETURN(rc);
+ RETURN(0);
}
static int
lprocfs_client_fid_fid_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
- rc = seq_printf(m, DFID"\n", PFID(&seq->lcs_fid));
+ seq_printf(m, DFID"\n", PFID(&seq->lcs_fid));
mutex_unlock(&seq->lcs_mutex);
- RETURN(rc);
+ RETURN(0);
}
static int
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
struct client_obd *cli;
- int rc;
ENTRY;
LASSERT(seq != NULL);
if (seq->lcs_exp != NULL) {
cli = &seq->lcs_exp->exp_obd->u.cli;
- rc = seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
+ seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
} else {
- rc = seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
+ seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
}
- RETURN(rc);
+ RETURN(0);
}
LPROC_SEQ_FOPS(lprocfs_client_fid_space);
LPROC_SEQ_FOPS_RO(lprocfs_client_fid_server);
LPROC_SEQ_FOPS_RO(lprocfs_client_fid_fid);
-struct lprocfs_seq_vars seq_client_proc_list[] = {
- { "space", &lprocfs_client_fid_space_fops },
- { "width", &lprocfs_client_fid_width_fops },
- { "server", &lprocfs_client_fid_server_fops },
- { "fid", &lprocfs_client_fid_fid_fops },
+struct lprocfs_vars seq_client_proc_list[] = {
+ { .name = "space",
+ .fops = &lprocfs_client_fid_space_fops },
+ { .name = "width",
+ .fops = &lprocfs_client_fid_width_fops },
+ { .name = "server",
+ .fops = &lprocfs_client_fid_server_fops },
+ { .name = "fid",
+ .fops = &lprocfs_client_fid_fid_fops },
{ NULL }
};
-#endif
+
+#endif /* CONFIG_PROC_FS */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff