*
* 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) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_FLD
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-#endif
-
+#include <libcfs/libcfs.h>
+#include <linux/module.h>
#include <dt_object.h>
#include <obd_support.h>
#include <lustre_fld.h>
#include <lustre_fid.h>
#include "fld_internal.h"
-#include <md_object.h>
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
static int
fld_proc_targets_seq_show(struct seq_file *m, void *unused)
{
}
static ssize_t
-fld_proc_hash_seq_write(struct file *file, const char *buffer,
+fld_proc_hash_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
- struct lu_client_fld *fld = ((struct seq_file *)file->private_data)->private;
- struct lu_fld_hash *hash = NULL;
- int i;
- ENTRY;
+ struct lu_client_fld *fld;
+ struct lu_fld_hash *hash = NULL;
+ char fh_name[8];
+ int i;
- LASSERT(fld != NULL);
+ if (count > sizeof(fh_name))
+ return -ENAMETOOLONG;
- for (i = 0; fld_hash[i].fh_name != NULL; i++) {
- if (count != strlen(fld_hash[i].fh_name))
- continue;
+ if (copy_from_user(fh_name, buffer, count) != 0)
+ return -EFAULT;
- if (!strncmp(fld_hash[i].fh_name, buffer, count)) {
- hash = &fld_hash[i];
- break;
- }
- }
+ fld = ((struct seq_file *)file->private_data)->private;
+ LASSERT(fld != NULL);
+
+ for (i = 0; fld_hash[i].fh_name != NULL; i++) {
+ if (count != strlen(fld_hash[i].fh_name))
+ continue;
+
+ if (!strncmp(fld_hash[i].fh_name, fh_name, count)) {
+ hash = &fld_hash[i];
+ break;
+ }
+ }
if (hash != NULL) {
spin_lock(&fld->lcf_lock);
fld->lcf_name, hash->fh_name);
}
- RETURN(count);
+ return count;
}
static ssize_t
-lprocfs_cache_flush_seq_write(struct file *file, const char *buffer,
+lprocfs_cache_flush_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *pos)
{
struct lu_client_fld *fld = ((struct seq_file *)file->private_data)->private;
LPROC_SEQ_FOPS(fld_proc_hash);
LPROC_SEQ_FOPS_WO_TYPE(fld, cache_flush);
-struct lprocfs_seq_vars fld_client_proc_list[] = {
+struct lprocfs_vars fld_client_proc_list[] = {
{ .name = "targets",
.fops = &fld_proc_targets_fops },
{ .name = "hash",
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;
int env_init = 0;
int rc;
- LPROCFS_ENTRY_CHECK(PDE(inode));
+ rc = LPROCFS_ENTRY_CHECK(inode);
+ if (rc < 0)
+ return rc;
+
rc = seq_open(file, &fldb_sops);
if (rc)
GOTO(out, 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));
.release = fldb_seq_release,
};
-struct lprocfs_seq_vars fld_server_proc_list[] = {
+struct lprocfs_vars fld_server_proc_list[] = {
{ NULL }
};
# endif /* HAVE_SERVER_SUPPORT */
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */