LU-8468 kernel: kernel update RHEL7.2 [3.10.0-327.28.2.el7]

[fs/lustre-release.git] / lustre / fld / lproc_fld.c

diff --git a/lustre/fld/lproc_fld.c b/lustre/fld/lproc_fld.c
index 8dd6fe4..24e336c 100644 (file)
--- a/lustre/fld/lproc_fld.c
+++ b/lustre/fld/lproc_fld.c
@@ -27,7 +27,7 @@
  * 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, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -50,9 +50,8 @@
 #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)
 {
@@ -88,22 +87,29 @@ static ssize_t
 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;
+
+       if (copy_from_user(fh_name, buffer, count) != 0)
+               return -EFAULT;
 
-        for (i = 0; fld_hash[i].fh_name != NULL; i++) {
-                if (count != strlen(fld_hash[i].fh_name))
-                        continue;
+       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, buffer, count)) {
-                        hash = &fld_hash[i];
-                        break;
-                }
-        }
+               if (!strncmp(fld_hash[i].fh_name, fh_name, count)) {
+                       hash = &fld_hash[i];
+                       break;
+               }
+       }
 
        if (hash != NULL) {
                spin_lock(&fld->lcf_lock);
@@ -114,7 +120,7 @@ fld_proc_hash_seq_write(struct file *file, const char __user *buffer,
                       fld->lcf_name, hash->fh_name);
        }
 
-       RETURN(count);
+       return count;
 }
 
 static ssize_t
@@ -137,7 +143,7 @@ LPROC_SEQ_FOPS_RO(fld_proc_targets);
 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",
@@ -257,7 +263,7 @@ static int fldb_seq_show(struct seq_file *p, void *v)
                       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;
@@ -280,7 +286,10 @@ static int fldb_seq_open(struct inode *inode, struct file *file)
        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);
@@ -302,7 +311,7 @@ static int fldb_seq_open(struct inode *inode, struct file *file)
 
        env_init = 1;
        iops = &obj->do_index_ops->dio_it;
-       param->fsp_it = iops->init(&param->fsp_env, obj, 0, NULL);
+       param->fsp_it = iops->init(&param->fsp_env, obj, 0);
        if (IS_ERR(param->fsp_it))
                GOTO(out, rc = PTR_ERR(param->fsp_it));
 
@@ -357,10 +366,10 @@ const struct file_operations fld_proc_seq_fops = {
        .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 */