linux-kernel - Re: linux-next: build failure after merge of the xfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 10 May 2012 13:43:23 -0500
From:	Ben Myers <bpm@....com>
To:	Mark Tinguely <tinguely@....com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	xfs@....sgi.com
Subject: Re: linux-next: build failure after merge of the xfs tree

On Thu, May 10, 2012 at 01:36:14PM -0500, Mark Tinguely wrote:
> On 05/10/12 13:32, Ben Myers wrote:
> 
> >Signed-off-by: Ben Myers<bpm@....com>
> >
> >Index: xfs/fs/xfs/xfs_alloc.c
> >===================================================================
> >--- xfs.orig/fs/xfs/xfs_alloc.c
> >+++ xfs/fs/xfs/xfs_alloc.c
> >@@ -47,8 +47,6 @@ STATIC int xfs_alloc_ag_vextent_near(xfs
> >  STATIC int xfs_alloc_ag_vextent_size(xfs_alloc_arg_t *);
> >  STATIC int xfs_alloc_ag_vextent_small(xfs_alloc_arg_t *,
> >  		xfs_btree_cur_t *, xfs_agblock_t *, xfs_extlen_t *, int *);
> >-STATIC void xfs_extent_busy_trim(struct xfs_alloc_arg *,
> >-		xfs_agblock_t, xfs_extlen_t, xfs_agblock_t *, xfs_extlen_t *);
> >
> >  /*
> >   * Lookup the record equal to [bno, len] in the btree given by cur.
> >Index: xfs/fs/xfs/xfs_extent_busy.c
> >===================================================================
> >--- xfs.orig/fs/xfs/xfs_extent_busy.c
> >+++ xfs/fs/xfs/xfs_extent_busy.c
> >@@ -345,7 +345,7 @@ restart:
> >   * args->minlen no suitable extent could be found, and the higher level
> >   * code needs to force out the log and retry the allocation.
> >   */
> >-STATIC void
> >+void
> >  xfs_extent_busy_trim(
> >  	struct xfs_alloc_arg	*args,
> >  	xfs_agblock_t		bno,
> >Index: xfs/fs/xfs/xfs_extent_busy.h
> >===================================================================
> >--- xfs.orig/fs/xfs/xfs_extent_busy.h
> >+++ xfs/fs/xfs/xfs_extent_busy.h
> >@@ -54,6 +54,10 @@ void
> >  xfs_extent_busy_reuse(struct xfs_mount *mp, xfs_agnumber_t agno,
> >  	xfs_agblock_t fbno, xfs_extlen_t flen, bool userdata);
> >
> >+void
> >+xfs_extent_busy_trim(struct xfs_alloc_arg *args, xfs_agblock_t bno,
> >+	xfs_extlen_t len, xfs_agblock_t *rbno, xfs_extlen_t *rlen);
> >+
> >  int
> >  xfs_extent_busy_ag_cmp(void *priv, struct list_head *a, struct list_head *b);
> >
> >
> 
> Hmmm, I saw that before. I have been hand patching that to test.
> 
> Looks good.
> 
> Reviewed-by: Mark Tinguely <tinguely@....com>

CONFIG_XFS_DEBUG clears the #define of STATIC.  That's where this went off the
rails.

Thanks,
	Ben
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/