On Mon, Nov 03, 2008 at 03:42:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> fs/xfs/linux-2.6/xfs_super.c: In function 'xfs_init_zones':
> fs/xfs/linux-2.6/xfs_super.c:1714: error: 'xfs_vnode_zone' undeclared (first use in this function)
>
> It is a mismerge (in the linux-next tree) between commits
> 7836dda725873a5ce05d216295a452f16ccaab72 ("[XFS] Combine the XFS and
> Linux inodes") form the xfs tree and
> 200d770048651d9a03266dc1bf031bb6f9e1363a ("Filesystem: XFS slab
> defragmentation") from the slab tree.
I didn't even know that the slab defrag stuff was being carried in
a tree anywhere. The xfs_vnode_zone has gone away, so I guess that
hunk can be dropped. defrag should really now target the xfs_inode_zone,
but it's going to need custom get and kick methods because it's
far different to the generic inode code now....
> I guess the latter patch needs to be dropped since its target is going
> away.
>
> I fixed up the merge (see below) and can carry the fix for a few days.
Yeah, that will work for the moment. It's probably best that we
don't try to add defrag back into the XFS inode code until we've
sorted all the niggling problems as a result of the "combine..."
patch.
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
