From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shaohua Li <shli@kernel.org>, Jens Axboe <axboe@kernel.dk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>,
Pawel Baldysiak <pawel.baldysiak@intel.com>,
Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Subject: linux-next: manual merge of the md tree with the block tree
Date: Tue, 29 Aug 2017 14:13:36 +1000 [thread overview]
Message-ID: <20170829141336.136e7d3e@canb.auug.org.au> (raw)
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5-ppl.c
between commit:
74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index")
from the block tree and commit:
ddc088238cd6 ("md: Runtime support for multiple ppls")
from the md tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/md/raid5-ppl.c
index 1e237c40d6fa,a98ef172f8e8..000000000000
--- a/drivers/md/raid5-ppl.c
+++ b/drivers/md/raid5-ppl.c
@@@ -451,12 -456,25 +456,25 @@@ static void ppl_submit_iounit(struct pp
pplhdr->entries_count = cpu_to_le32(io->entries_count);
pplhdr->checksum = cpu_to_le32(~crc32c_le(~0, pplhdr, PPL_HEADER_SIZE));
+ /* Rewind the buffer if current PPL is larger then remaining space */
+ if (log->use_multippl &&
+ log->rdev->ppl.sector + log->rdev->ppl.size - log->next_io_sector <
+ (PPL_HEADER_SIZE + io->pp_size) >> 9)
+ log->next_io_sector = log->rdev->ppl.sector;
+
+
bio->bi_end_io = ppl_log_endio;
bio->bi_opf = REQ_OP_WRITE | REQ_FUA;
- bio->bi_bdev = log->rdev->bdev;
+ bio_set_dev(bio, log->rdev->bdev);
- bio->bi_iter.bi_sector = log->rdev->ppl.sector;
+ bio->bi_iter.bi_sector = log->next_io_sector;
bio_add_page(bio, io->header_page, PAGE_SIZE, 0);
+ pr_debug("%s: log->current_io_sector: %llu\n", __func__,
+ (unsigned long long)log->next_io_sector);
+
+ if (log->use_multippl)
+ log->next_io_sector += (PPL_HEADER_SIZE + io->pp_size) >> 9;
+
list_for_each_entry(sh, &io->stripe_list, log_list) {
/* entries for full stripe writes have no partial parity */
if (test_bit(STRIPE_FULL_WRITE, &sh->state))
next reply other threads:[~2017-08-29 4:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-29 4:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-31 4:34 linux-next: manual merge of the md tree with the block tree Stephen Rothwell
2017-06-13 4:33 Stephen Rothwell
2017-04-12 2:31 Stephen Rothwell
2017-04-10 2:08 Stephen Rothwell
2017-04-10 2:03 Stephen Rothwell
2016-11-23 2:17 Stephen Rothwell
2016-11-22 4:50 Stephen Rothwell
2016-06-14 3:52 Stephen Rothwell
2016-06-14 3:52 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2014-01-15 4:07 Stephen Rothwell
2014-01-15 5:30 ` NeilBrown
2012-09-21 2:49 Stephen Rothwell
2011-10-07 3:06 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=20170829141336.136e7d3e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=artur.paszkiewicz@intel.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pawel.baldysiak@intel.com \
--cc=shli@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).