Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753810Ab3HPIbY (ORCPT ); Fri, 16 Aug 2013 04:31:24 -0400 Received: from mail.active-venture.com ([67.228.131.205]:61922 "EHLO mail.active-venture.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753459Ab3HPIbU (ORCPT ); Fri, 16 Aug 2013 04:31:20 -0400 X-Originating-IP: 108.223.40.66 Message-ID: <520DE356.9060506@roeck-us.net> Date: Fri, 16 Aug 2013 01:31:18 -0700 From: Guenter Roeck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Geert Uytterhoeven CC: Alasdair Kergon , Joe Thornber , Mike Snitzer , dm-devel@redhat.com, sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman Subject: Re: [PATCH] dm cache: Avoid conflicting remove_mapping() in mq policy References: <1374825451-30463-1-git-send-email-geert@linux-m68k.org> In-Reply-To: <1374825451-30463-1-git-send-email-geert@linux-m68k.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2017 Lines: 66 On 07/26/2013 12:57 AM, Geert Uytterhoeven wrote: > On sparc32, which includes from : > > drivers/md/dm-cache-policy-mq.c:962:13: error: conflicting types for 'remove_mapping' > include/linux/swap.h:285:12: note: previous declaration of 'remove_mapping' was here > > As mq_remove_mapping() already exists, and the local remove_mapping() is > used only once, inline it manually to avoid the conflict. > > Signed-off-by: Geert Uytterhoeven Is this patch going anyhere ? The problem breaks the sparc32:allmodconfig build, so it would be useful to get it fixed. Thanks, Guenter > --- > I think this is also needed on hexagon, which includes from > . > > drivers/md/dm-cache-policy-mq.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/md/dm-cache-policy-mq.c b/drivers/md/dm-cache-policy-mq.c > index dc112a7..4296155 100644 > --- a/drivers/md/dm-cache-policy-mq.c > +++ b/drivers/md/dm-cache-policy-mq.c > @@ -959,23 +959,21 @@ out: > return r; > } > > -static void remove_mapping(struct mq_policy *mq, dm_oblock_t oblock) > +static void mq_remove_mapping(struct dm_cache_policy *p, dm_oblock_t oblock) > { > - struct entry *e = hash_lookup(mq, oblock); > + struct mq_policy *mq = to_mq_policy(p); > + struct entry *e; > + > + mutex_lock(&mq->lock); > + > + e = hash_lookup(mq, oblock); > > BUG_ON(!e || !e->in_cache); > > del(mq, e); > e->in_cache = false; > push(mq, e); > -} > > -static void mq_remove_mapping(struct dm_cache_policy *p, dm_oblock_t oblock) > -{ > - struct mq_policy *mq = to_mq_policy(p); > - > - mutex_lock(&mq->lock); > - remove_mapping(mq, oblock); > mutex_unlock(&mq->lock); > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/