Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 10 Jan 2020 17:57:29 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Al Viro <viro@ZenIV.linux.org.uk>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Carlos Maiolino <cmaiolino@redhat.com>
Subject: linux-next: build failure after merge of the vfs tree
Message-ID: <20200110175729.3b5d2338@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vv5f=h6dcSYkxoC+bwd_hB2";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/vv5f=h6dcSYkxoC+bwd_hB2
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allnoconfig)
failed like this:

fs/inode.c:1615:5: error: redefinition of 'bmap'
 1615 | int bmap(struct inode *inode, sector_t *block)
      |     ^~~~
In file included from fs/inode.c:7:
include/linux/fs.h:2867:19: note: previous definition of 'bmap' was here
 2867 | static inline int bmap(struct inode *inode,  sector_t *block)
      |                   ^~~~

Caused by commit

  65a805fdd75f ("fibmap: Use bmap instead of ->bmap method in ioctl_fibmap")

I have added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 10 Jan 2020 17:53:19 +1100
Subject: [PATCH] fs: fix up for !CONFIG_BLOCK and bmap

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/inode.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/inode.c b/fs/inode.c
index 9f894b25af2b..590f36daa006 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1598,6 +1598,7 @@ void iput(struct inode *inode)
 }
 EXPORT_SYMBOL(iput);
=20
+#ifdef CONFIG_BLOCK
 /**
  *	bmap	- find a block number in a file
  *	@inode:  inode owning the block number being requested
@@ -1621,6 +1622,7 @@ int bmap(struct inode *inode, sector_t *block)
 	return 0;
 }
 EXPORT_SYMBOL(bmap);
+#endif
=20
 /*
  * With relative atime, only update atime if the previous atime is
--=20
2.24.0

--=20
Cheers,
Stephen Rothwell

--Sig_/vv5f=h6dcSYkxoC+bwd_hB2
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4YIFkACgkQAVBC80lX
0GyxBQf/RzArvoj4CM7CXQ574qEmieNaTjvoXQpRPglLfjg93NCT0QUsdup0mYtU
eQwptOAxum2K5EkGGdCqD2+yMxKzETG7Jh++Wlf0aa+G0wYpAYIY67r96QXnwCwy
uxd99r4yxWFlPUQIXmrGsAZE/73K2DjJFngEjHfBwyQaodH8LRRszyCNMxLfXkwW
iOAi0iApveyemMGGo7t+DCeASNbjWCE/L1qvDLMV4AHXwq/on2dzv5GQF9TPegl2
+xU/3B8YZsT9ZiOaqOiOdZsVd96vNrEmhM2HJYSPnukytVbwdfUQmj6WS0u5suxD
8fC5xCLZc8gJcyhjwHGXdCjRI+safg==
=Ph5h
-----END PGP SIGNATURE-----

--Sig_/vv5f=h6dcSYkxoC+bwd_hB2--