[4.9,03/64] padata: get_next is never NULL

Message ID	20200526183914.315757266@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=+fRt=7I=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "Jason A. Donenfeld" <Jason@zx2c4.com>, Dan Carpenter <dan.carpenter@oracle.com>, Steffen Klassert <steffen.klassert@secunet.com>, Herbert Xu <herbert@gondor.apana.org.au>, Ben Hutchings <ben@decadent.org.uk> Subject: [PATCH 4.9 03/64] padata: get_next is never NULL Date: Tue, 26 May 2020 20:52:32 +0200 Message-Id: <20200526183914.315757266@linuxfoundation.org> In-Reply-To: <20200526183913.064413230@linuxfoundation.org> References: <20200526183913.064413230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,03/64] padata: get_next is never NULL [4.9,04/64] padata: ensure the reorder timer callback runs on the correct CPU [4.9,06/64] evm: Check also if *tfm is an error pointer in init_desc() [4.9,07/64] ima: Fix return value of ima_write_policy() [4.9,09/64] iommu/amd: Fix over-read of ACPI UID from IVRS table [4.9,12/64] HID: multitouch: add eGalaxTouch P80H84 support [4.9,13/64] configfs: fix config_item refcnt leak in configfs_rmdir() [4.9,16/64] ceph: fix double unlock in handle_cap_export() [4.9,17/64] USB: core: Fix misleading driver bug report [4.9,19/64] ARM: futex: Address build warning [4.9,21/64] padata: set cpu_index of unused CPUs to -1 [4.9,22/64] padata: Replace delayed timer with immediate workqueue in padata_reorder [4.9,25/64] arm64: fix the flush_icache_range arguments in machine_kexec [4.9,32/64] l2tp: remove useless duplicate session detection in l2tp_netlink [4.9,40/64] l2tp: hold tunnel while handling genl TUNNEL_GET commands [4.9,41/64] l2tp: hold tunnel used while creating sessions with netlink [4.9,43/64] l2tp: pass tunnel pointer to ->session_create() [4.9,44/64] l2tp: fix l2tp_eth module loading [4.9,45/64] l2tp: dont register sessions in l2tp_session_create() [4.9,46/64] l2tp: initialise l2tp_eth sessions before registering them [4.9,50/64] dmaengine: tegra210-adma: Fix an error handling path in tegra_adma_probe() [4.9,52/64] x86/uaccess, ubsan: Fix UBSAN vs. SMAP [4.9,53/64] ubsan: build ubsan.c more conservatively [4.9,55/64] libnvdimm/btt: Remove unnecessary code in btt_freelist_init [4.9,56/64] cxgb4: free mac_hlist properly [4.9,58/64] Revert "gfs2: Dont demote a glock until its revokes are written" [4.9,61/64] iio: dac: vf610: Fix an error handling path in vf610_dac_probe() [4.9,63/64] rapidio: fix an error in get_user_pages_fast() error handling [4.9,64/64] iio: sca3000: Remove an erroneous get_device()

Message ID

20200526183914.315757266@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, "Jason A. Donenfeld" <Jason@zx2c4.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	Ben Hutchings <ben@decadent.org.uk>
Subject: [PATCH 4.9 03/64] padata: get_next is never NULL
Date: Tue, 26 May 2020 20:52:32 +0200
Message-Id: <20200526183914.315757266@linuxfoundation.org>
In-Reply-To: <20200526183913.064413230@linuxfoundation.org>
References: <20200526183913.064413230@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg Kroah-Hartman May 26, 2020, 6:52 p.m. UTC

From: Jason A. Donenfeld <Jason@zx2c4.com>

commit 69b348449bda0f9588737539cfe135774c9939a7 upstream.

Per Dan's static checker warning, the code that returns NULL was removed
in 2010, so this patch updates the comments and fixes the code
assumptions.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 kernel/padata.c |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -156,8 +156,6 @@  EXPORT_SYMBOL(padata_do_parallel);
  * A pointer to the control struct of the next object that needs
  * serialization, if present in one of the percpu reorder queues.
  *
- * NULL, if all percpu reorder queues are empty.
- *
  * -EINPROGRESS, if the next object that needs serialization will
  *  be parallel processed by another cpu and is not yet present in
  *  the cpu's reorder queue.
@@ -184,8 +182,6 @@  static struct padata_priv *padata_get_ne
 	cpu = padata_index_to_cpu(pd, next_index);
 	next_queue = per_cpu_ptr(pd->pqueue, cpu);
 
-	padata = NULL;
-
 	reorder = &next_queue->reorder;
 
 	spin_lock(&reorder->lock);
@@ -237,12 +233,11 @@  static void padata_reorder(struct parall
 		padata = padata_get_next(pd);
 
 		/*
-		 * All reorder queues are empty, or the next object that needs
-		 * serialization is parallel processed by another cpu and is
-		 * still on it's way to the cpu's reorder queue, nothing to
-		 * do for now.
+		 * If the next object that needs serialization is parallel
+		 * processed by another cpu and is still on it's way to the
+		 * cpu's reorder queue, nothing to do for now.
 		 */
-		if (!padata || PTR_ERR(padata) == -EINPROGRESS)
+		if (PTR_ERR(padata) == -EINPROGRESS)
 			break;
 
 		/*

[4.9,03/64] padata: get_next is never NULL

Commit Message

Patch