Merge tag 'v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

Linux 4.9

diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 38887cc5577fa901acd907a0af2fb016a3441b2c..b5dbc9c6530cbcd6f6cdc5498ac1c8fa214c84de 100644 (file)
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -671,8 +671,10 @@ int orangefs_prepare_debugfs_help_string(int at_boot)
                 */
                cdm_element_count =
                        orangefs_prepare_cdm_array(client_debug_array_string);
-               if (cdm_element_count <= 0)
+               if (cdm_element_count <= 0) {
+                       kfree(new);
                        goto out;
+               }
 
                for (i = 0; i < cdm_element_count; i++) {
                        strlcat(new, "\t", string_size);

diff --git a/fs/orangefs/orangefs-sysfs.c b/fs/orangefs/orangefs-sysfs.c
index a799546a67f779ef92f30f3bf959c3fd177b9292..084954448f1868840cbf3291cbb226206c2ffd51 100644 (file)
--- a/fs/orangefs/orangefs-sysfs.c
+++ b/fs/orangefs/orangefs-sysfs.c
@@ -609,15 +609,6 @@ static ssize_t sysfs_service_op_store(struct kobject *kobj,
                        new_op->upcall.req.param.u.value32[0] = val1;
                        new_op->upcall.req.param.u.value32[1] = val2;
                        goto value_set;
-               } else if (!strcmp(attr->attr.name,
-                                  "perf_counter_reset")) {
-                       if ((val > 0)) {
-                               new_op->upcall.req.param.op =
-                               ORANGEFS_PARAM_REQUEST_OP_READAHEAD_COUNT_SIZE;
-                       } else {
-                               rc = 0;
-                               goto out;
-                       }
                }
 
        } else if (!strcmp(kobj->name, ACACHE_KOBJ_ID)) {