Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754960AbcCAXxl (ORCPT ); Tue, 1 Mar 2016 18:53:41 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:44579 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754912AbcCAXxg (ORCPT ); Tue, 1 Mar 2016 18:53:36 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=Q/LZX2GLzNfykYdrXTbuJSdxtmAuLxtEDZv4uYP+PdbkykE/crjDKgjOEpcfKbSdFwU/WmVLXjPK DFLUXImddkDh51638LG8T6GHxd+IwlR73X51WhiuIra5cTVS0UR0W6/EQYjUPjJOX96yLFe1kR89 YLLMW81RcaZ1x/ARhAU=; From: Greg Kroah-Hartman Subject: [PATCH 3.14 097/130] dm space map metadata: remove unused variable in brb_pop() X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , David Binderman , Mike Snitzer Message-Id: <20160301234503.256399611@linuxfoundation.org> In-Reply-To: <20160301234459.768886030@linuxfoundation.org> References: <20160301234459.768886030@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.aa5990f25af04ea284d3710fe3caf190 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:53:30 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1148 Lines: 38 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mike Snitzer commit 512167788a6fe9481a33a3cce5f80b684631a1bb upstream. Remove the unused struct block_op pointer that was inadvertantly introduced, via cut-and-paste of previous brb_op() code, as part of commit 50dd842ad. (Cc'ing stable@ because commit 50dd842ad did) Fixes: 50dd842ad ("dm space map metadata: fix ref counting bug when bootstrapping a new space map") Reported-by: David Binderman Signed-off-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- drivers/md/persistent-data/dm-space-map-metadata.c | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/md/persistent-data/dm-space-map-metadata.c +++ b/drivers/md/persistent-data/dm-space-map-metadata.c @@ -152,12 +152,9 @@ static int brb_peek(struct bop_ring_buff static int brb_pop(struct bop_ring_buffer *brb) { - struct block_op *bop; - if (brb_empty(brb)) return -ENODATA; - bop = brb->bops + brb->begin; brb->begin = brb_next(brb, brb->begin); return 0;