From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kent Overstreet <kmo@daterainc.com>,
Chao Yu <chao2.yu@samsung.com>,
Jaegeuk Kim <jaegeuk.kim@samsung.com>
Subject: linux-next: manual merge of the block tree with the f2fs tree
Date: Fri, 1 Nov 2013 14:29:18 +1100 [thread overview]
Message-ID: <20131101142918.147eb63b910dde9b5bb90aee@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/f2fs/segment.c between commit cc7b1bb17367 ("f2fs: avoid allocating
failure in bio_alloc") from the f2fs tree and commit ed2d2f9a8265
("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@canb.auug.org.au
diff --cc fs/f2fs/segment.c
index 3d4d5fc19e6f,9d77ce168676..000000000000
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@@ -675,9 -676,8 +675,9 @@@ retry
goto retry;
}
- sbi->bio[type] = f2fs_bio_alloc(bdev, max_hw_blocks(sbi));
+ bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
+ sbi->bio[type] = f2fs_bio_alloc(bdev, bio_blocks);
- sbi->bio[type]->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
+ sbi->bio[type]->bi_iter.bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
sbi->bio[type]->bi_private = priv;
/*
* The end_io will be assigned at the sumbission phase.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-11-01 3:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 3:29 Stephen Rothwell [this message]
2013-11-26 0:56 linux-next: manual merge of the block tree with the f2fs tree Stephen Rothwell
2013-11-26 1:00 Stephen Rothwell
2013-12-02 4:04 Stephen Rothwell
2013-12-12 2:57 Stephen Rothwell
2013-12-18 3:57 Stephen Rothwell
2014-01-06 6:03 Stephen Rothwell
2015-07-30 3:19 Stephen Rothwell
2016-06-09 3:26 Stephen Rothwell
2016-06-09 3:34 ` Stephen Rothwell
2016-06-20 2:37 Stephen Rothwell
2016-07-11 4:52 Stephen Rothwell
2016-11-22 3:42 Stephen Rothwell
2020-12-03 3:43 Stephen Rothwell
2020-12-03 3:47 ` Chao Yu
2020-12-03 3:57 ` Stephen Rothwell
2020-12-14 20:12 ` Stephen Rothwell
2020-12-17 1:50 ` 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=20131101142918.147eb63b910dde9b5bb90aee@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=chao2.yu@samsung.com \
--cc=jaegeuk.kim@samsung.com \
--cc=kmo@daterainc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).