Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e176d69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs updates from Mike Marshall:
 "Two small fixes sent in by other developers:

   - axe some dead code (Christophe Jaillet)

   - fix memory leak (Colin Ian King, found by Coverity)"

* tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: Axe some dead code
  orangefs: fix memory leak of string 'new' on exit path
parents 39d2c3b9 04102c76

fs/orangefs/orangefs-debugfs.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

fs/orangefs/orangefs-sysfs.c

+0 −9
Original line number Diff line number Diff line
@@ -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)) {