]> git.baikalelectronics.ru Git - kernel.git/commit
dm cache: avoid conflicting remove_mapping() in mq policy
authorGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 26 Jul 2013 07:57:31 +0000 (09:57 +0200)
committerMike Snitzer <snitzer@redhat.com>
Fri, 16 Aug 2013 19:56:51 +0000 (15:56 -0400)
commitdcecb7dd0c9b6522c613da71b9f247395b505c80
treed9e14b5d43f55309360a9e73d2b7f25b0c60e54a
parentd8cdf0447a4fa614a941194dc269393450daf519
dm cache: avoid conflicting remove_mapping() in mq policy

On sparc32, which includes <linux/swap.h> from <asm/pgtable_32.h>:

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 <geert@linux-m68k.org>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair Kergon <agk@redhat.com>
Acked-by: Joe Thornber <ejt@redhat.com>
drivers/md/dm-cache-policy-mq.c