orangefs: drop two patches n/a to 4.8.x baseline

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 0 insertions, 124 deletions

diff --git a/queue/orangefs-Dan-Carpenter-influenced-cleanups.patch b/queue/orangefs-Dan-Carpenter-influenced-cleanups.patch
deleted file mode 100644
index 4004b6c..0000000
--- a/queue/orangefs-Dan-Carpenter-influenced-cleanups.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 05973c2efb40122f2a9ecde2d065f7ea5068d024 Mon Sep 17 00:00:00 2001
-From: Mike Marshall <hubcap@omnibond.com>
-Date: Thu, 9 Feb 2017 14:38:50 -0500
-Subject: [PATCH] orangefs: Dan Carpenter influenced cleanups...
-
-commit 05973c2efb40122f2a9ecde2d065f7ea5068d024 upstream.
-
-This patch is simlar to one Dan Carpenter sent me, cleans
-up some return codes and whitespace errors. There was one
-place where he thought inserting an error message into
-the ring buffer might be too chatty, I hope I convinced him
-othewise. As a consolation <g> I changed a truly chatty
-error message in another location into a debug message,
-system-admins had already yelled at me about that one...
-
-Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-
-diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
-index 516ffb4dc9a0..f419dd999581 100644
---- a/fs/orangefs/devorangefs-req.c
-+++ b/fs/orangefs/devorangefs-req.c
-@@ -402,8 +402,9 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb,
- 	/* remove the op from the in progress hash table */
- 	op = orangefs_devreq_remove_op(head.tag);
- 	if (!op) {
--		gossip_err("WARNING: No one's waiting for tag %llu\n",
--			   llu(head.tag));
-+		gossip_debug(GOSSIP_DEV_DEBUG,
-+			     "%s: No one's waiting for tag %llu\n",
-+			     __func__, llu(head.tag));
- 		return ret;
- 	}
- 
-diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
-index b5dbc9c6530c..0748a26598fc 100644
---- a/fs/orangefs/orangefs-debugfs.c
-+++ b/fs/orangefs/orangefs-debugfs.c
-@@ -965,13 +965,13 @@ int orangefs_debugfs_new_client_string(void __user *arg)
- 	int ret;
- 
- 	ret = copy_from_user(&client_debug_array_string,
--                                     (void __user *)arg,
--                                     ORANGEFS_MAX_DEBUG_STRING_LEN);
-+			     (void __user *)arg,
-+			     ORANGEFS_MAX_DEBUG_STRING_LEN);
- 
- 	if (ret != 0) {
- 		pr_info("%s: CLIENT_STRING: copy_from_user failed\n",
- 			__func__);
--		return -EIO;
-+		return -EFAULT;
- 	}
- 
- 	/*
-@@ -986,17 +986,18 @@ int orangefs_debugfs_new_client_string(void __user *arg)
- 	 */
- 	client_debug_array_string[ORANGEFS_MAX_DEBUG_STRING_LEN - 1] =
- 		'\0';
--	
-+
- 	pr_info("%s: client debug array string has been received.\n",
- 		__func__);
- 
- 	if (!help_string_initialized) {
- 
- 		/* Build a proper debug help string. */
--		if (orangefs_prepare_debugfs_help_string(0)) {
-+		ret = orangefs_prepare_debugfs_help_string(0);
-+		if (ret) {
- 			gossip_err("%s: no debug help string \n",
- 				   __func__);
--			return -EIO;
-+			return ret;
- 		}
- 
- 	}
-@@ -1009,7 +1010,7 @@ int orangefs_debugfs_new_client_string(void __user *arg)
- 
- 	help_string_initialized++;
- 
--	return ret;
-+	return 0;
- }
- 
- int orangefs_debugfs_new_debug(void __user *arg) 
--- 
-2.12.0
-
diff --git a/queue/orangefs-fix-memory-leak-of-string-new-on-exit-path.patch b/queue/orangefs-fix-memory-leak-of-string-new-on-exit-path.patch
deleted file mode 100644
index 3c3c868..0000000
--- a/queue/orangefs-fix-memory-leak-of-string-new-on-exit-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4defb5f912a0ba60e07e91a4b62634814cd99b7f Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Fri, 2 Dec 2016 15:18:06 +0000
-Subject: [PATCH] orangefs: fix memory leak of string 'new' on exit path
-
-commit 4defb5f912a0ba60e07e91a4b62634814cd99b7f upstream.
-
-allocates string 'new' is not free'd on the exit path when
-cdm_element_count <= 0. Fix this by kfree'ing it.
-
-Fixes CoverityScan CID#1375923 "Resource Leak"
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
-Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-
-diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
-index 38887cc5577f..b5dbc9c6530c 100644
---- 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);
--- 
-2.12.0
-
diff --git a/queue/series b/queue/series
index 26c39a3..08a4ee9 100644
--- a/queue/series
+++ b/queue/series
@@ -123,8 +123,6 @@ drm-i915-gen9-Increase-PCODE-request-timeout-to-50ms.patch
 drm-i915-Nuke-debug-messages-from-the-pipe-update-cr.patch
 drm-i915-Avoid-tweaking-evaluation-thresholds-on-Bay.patch
 drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch
-orangefs-fix-memory-leak-of-string-new-on-exit-path.patch
-orangefs-Dan-Carpenter-influenced-cleanups.patch
 orangefs-fix-buffer-size-mis-match-between-kernel-sp.patch
 i2c-bcm2835-Fix-hang-for-writing-messages-larger-tha.patch
 rt2x00usb-fix-anchor-initialization.patch