linux-next: build failure after merge of the vfs tree
in [Kernel]
|
Prev: writeback: dont redirty tail an inode with dirty pages
Next: [PATCH 0/2] Common struct clk implementation, v6
From: Stephen Rothwell on 11 Jul 2010 22:30 Hi Al, After merging the vfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/nilfs2/inode.c: In function 'nilfs_clear_inode': fs/nilfs2/inode.c:630: error: implicit declaration of function 'nilfs_btnode_cache_clear' Caused by commit 743a0a2f1a89e53d656ec6a2f715111d92642bcb ("convert nilfs2 to ->evict_inode()") interacting with commit ceb4f9c819c321e7eabf53b51f956ff959561573 ("nilfs2: get rid of nilfs_bmap_union") from the nilfs2 tree which removed the implicit inclusion of btnode.h (via bmap_union.h via nilfs.h). I have added the following patch for today (which should be applied to the vfs tree or merged into the above vfs tree commit): From: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Mon, 12 Jul 2010 12:17:47 +1000 Subject: [PATCH] nilfs2: inode.c needs to include btnode.h directly now Due to the new usage of nilfs_btnode_cache_clear(). Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> --- fs/nilfs2/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 8fea40e..eccb2f2 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -27,6 +27,7 @@ #include <linux/writeback.h> #include <linux/uio.h> #include "nilfs.h" +#include "btnode.h" #include "segment.h" #include "page.h" #include "mdt.h" -- 1.7.1 -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Ryusuke Konishi on 12 Jul 2010 01:40
On Mon, 12 Jul 2010 12:24:58 +1000, Stephen Rothwell wrote: > Hi Al, > > After merging the vfs tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > fs/nilfs2/inode.c: In function 'nilfs_clear_inode': > fs/nilfs2/inode.c:630: error: implicit declaration of function 'nilfs_btnode_cache_clear' > > Caused by commit 743a0a2f1a89e53d656ec6a2f715111d92642bcb ("convert > nilfs2 to ->evict_inode()") interacting with commit > ceb4f9c819c321e7eabf53b51f956ff959561573 ("nilfs2: get rid of > nilfs_bmap_union") from the nilfs2 tree which removed the implicit > inclusion of btnode.h (via bmap_union.h via nilfs.h). > > I have added the following patch for today (which should be applied to > the vfs tree or merged into the above vfs tree commit): Thank you for the catch. I would appreciate it if this is applied to the vfs tree. The problem is that I didn't include btnode.h in nilfs2/super.c, but the above handling looks natural since the current nilfs2/inode.c does not need the inclusion of btnode.h. Regards, Ryusuke Konishi > From: Stephen Rothwell <sfr(a)canb.auug.org.au> > Date: Mon, 12 Jul 2010 12:17:47 +1000 > Subject: [PATCH] nilfs2: inode.c needs to include btnode.h directly now > > Due to the new usage of nilfs_btnode_cache_clear(). > > Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> > --- > fs/nilfs2/inode.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c > index 8fea40e..eccb2f2 100644 > --- a/fs/nilfs2/inode.c > +++ b/fs/nilfs2/inode.c > @@ -27,6 +27,7 @@ > #include <linux/writeback.h> > #include <linux/uio.h> > #include "nilfs.h" > +#include "btnode.h" > #include "segment.h" > #include "page.h" > #include "mdt.h" > -- > 1.7.1 > > -- > Cheers, > Stephen Rothwell sfr(a)canb.auug.org.au > http://www.canb.auug.org.au/~sfr/ > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |