From: Mike Snitzer Date: Mon, 14 Dec 2015 14:26:01 +0000 (-0500) Subject: dm space map metadata: remove unused variable in brb_pop() X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~3599 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=925c8dbb7701d16d7ad545c0c20be4621ef8986a;p=mirror_ubuntu-zesty-kernel.git dm space map metadata: remove unused variable in brb_pop() BugLink: http://bugs.launchpad.net/bugs/1553179 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 Signed-off-by: Tim Gardner --- diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c index fca6dbcf9a47..7e44005595c1 100644 --- 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_buffer *brb, struct block_op *result) 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;