From: Mark Tinguely <tinguely@sgi.com>
To: Ben Myers <bpm@sgi.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
xfs@oss.sgi.com
Subject: Re: linux-next: build failure after merge of the xfs tree
Date: Thu, 10 May 2012 13:36:14 -0500 [thread overview]
Message-ID: <4FAC0A9E.3020909@sgi.com> (raw)
In-Reply-To: <20120510183245.GL3963@sgi.com>
On 05/10/12 13:32, Ben Myers wrote:
> Signed-off-by: Ben Myers<bpm@sgi.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@sgi.com>
next prev parent reply other threads:[~2012-05-10 18:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 3:01 linux-next: build failure after merge of the xfs tree Stephen Rothwell
2012-05-10 18:32 ` Ben Myers
2012-05-10 18:36 ` Mark Tinguely [this message]
2012-05-10 18:43 ` Ben Myers
-- strict thread matches above, loose matches on Subject: below --
2020-07-07 0:27 Stephen Rothwell
2019-10-28 23:11 Stephen Rothwell
2019-10-28 23:18 ` Darrick J. Wong
2019-10-29 5:56 ` Christoph Hellwig
2019-10-29 6:23 ` Stephen Rothwell
2019-10-29 6:32 ` Christoph Hellwig
2019-07-01 1:12 Stephen Rothwell
2016-02-09 0:17 Stephen Rothwell
2016-02-09 0:30 ` Eric Sandeen
2016-02-09 0:41 ` Stephen Rothwell
2015-04-20 2:35 Stephen Rothwell
2013-04-29 1:29 Stephen Rothwell
2013-04-29 1:40 ` Dave Chinner
2013-04-30 18:36 ` Ben Myers
2010-10-08 0:08 Stephen Rothwell
2010-07-26 1:51 Stephen Rothwell
2010-07-26 3:54 ` Dave Chinner
2010-07-26 4:28 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FAC0A9E.3020909@sgi.com \
--to=tinguely@sgi.com \
--cc=bpm@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).