lkml.org 
[lkml]   [2020]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the vfs tree
Hi all,

On Fri, 24 Jan 2020 13:41:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 10 Jan 2020 17:57:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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);
> >
> > +#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
> >
> > /*
> > * With relative atime, only update atime if the previous atime is
> > --
> > 2.24.0
>
> I am still applying this patch each day ...

Ping?

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-01-29 23:41    [W:0.109 / U:0.812 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site