linux-kernel - linux-next: manual merge of the block tree with the f2fs 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>] [day] [month] [year] [list]

Message-Id: <20131126115613.55f5f0f544c57677be035582@canb.auug.org.au>
Date:	Tue, 26 Nov 2013 11:56:13 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>, Jaegeuk Kim <jaegeuk.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kent Overstreet <kmo@...erainc.com>
Subject: linux-next: manual merge of the block tree with the f2fs tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
fs/f2fs/segment.c between commit a79ad49b87f4 ("f2fs: introduce a bio
array for per-page write bios") from the f2fs tree and commit
4f024f3797c4 ("block: Abstract out bvec iterator") from the block tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc fs/f2fs/segment.c
index 1c84b7e15631,36e8afd8e1e4..000000000000
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@@ -908,9 -681,9 +906,9 @@@ retry
  		}
  
  		bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
 -		sbi->bio[type] = f2fs_bio_alloc(bdev, bio_blocks);
 -		sbi->bio[type]->bi_iter.bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
 -		sbi->bio[type]->bi_private = priv;
 +		io->bio = f2fs_bio_alloc(bdev, bio_blocks);
- 		io->bio->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
++		io->bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
 +		io->bio->bi_private = priv;
  		/*
  		 * The end_io will be assigned at the sumbission phase.
  		 * Until then, let bio_add_page() merge consecutive IOs as much

Content of type "application/pgp-signature" skipped