linux-kernel - Re: linux-next: build failure after merge of the final tree (block tree related)

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] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 2 Apr 2013 10:22:36 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kent Overstreet <koverstreet@...gle.com>
Subject: Re: linux-next: build failure after merge of the final tree (block
 tree related)

Hi Jens,

On Tue, 26 Mar 2013 17:31:59 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (powerpc allyesconfig)
> failed like this:
> 
> drivers/built-in.o: In function `bio_alloc_pages':
> (.opd+0x2364a8): multiple definition of `bio_alloc_pages'
> fs/built-in.o:(.opd+0x7188): first defined here
> 
> Caused by an interaction between commits a07876064a0b ("block: Add
> bio_alloc_pages()") and commit cafe56359144 ("bcache: A block layer
> cache") from the block tree.
> 
> I have applied the following fix patch (this should have happened in
> merge commit 12f45f28441e "Merge branch 'for-3.10/drivers' into
> for-next"):
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Tue, 26 Mar 2013 17:26:45 +1100
> Subject: [PATCH] block: remove the extra copy of bio_alloc_pages
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/md/bcache/util.c | 18 ------------------
>  drivers/md/bcache/util.h |  2 --
>  2 files changed, 20 deletions(-)
> 
> diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
> index dcec2e4..671a55d 100644
> --- a/drivers/md/bcache/util.c
> +++ b/drivers/md/bcache/util.c
> @@ -237,24 +237,6 @@ start:		bv->bv_len	= min_t(size_t, PAGE_SIZE - bv->bv_offset,
>  }
>  EXPORT_SYMBOL_GPL(bio_map);
>  
> -int bio_alloc_pages(struct bio *bio, gfp_t gfp)
> -{
> -	int i;
> -	struct bio_vec *bv;
> -
> -	bio_for_each_segment(bv, bio, i) {
> -		bv->bv_page = alloc_page(gfp);
> -		if (!bv->bv_page) {
> -			while (bv-- != bio->bi_io_vec + bio->bi_idx)
> -				__free_page(bv->bv_page);
> -			return -ENOMEM;
> -		}
> -	}
> -
> -	return 0;
> -}
> -EXPORT_SYMBOL_GPL(bio_alloc_pages);
> -
>  /*
>   * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group (Any
>   * use permitted, subject to terms of PostgreSQL license; see.)
> diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
> index 56705fd..499d746 100644
> --- a/drivers/md/bcache/util.h
> +++ b/drivers/md/bcache/util.h
> @@ -570,8 +570,6 @@ static inline unsigned fract_exp_two(unsigned x, unsigned fract_bits)
>  
>  void bio_map(struct bio *bio, void *base);
>  
> -int bio_alloc_pages(struct bio *bio, gfp_t gfp);
> -
>  static inline sector_t bdev_sectors(struct block_device *bdev)
>  {
>  	return bdev->bd_inode->i_size >> 9;
> -- 
> 1.8.1

Ping?
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped