mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Neil Brown <neilb@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Shaohua Li <shli@fusionio.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	Jens Axboe <axboe@kernel.dk>
Subject: linux-next: manual merge of the md tree with the  tree
Date: Fri, 21 Sep 2012 12:49:55 +1000	[thread overview]
Message-ID: <20120921124955.643dcd503be6cc67f5d1738c@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1682 bytes --]

Hi Neil,

Today's linux-next merge of the md tree got a conflict in fs/bio.c
between commit 4363ac7c13a9 ("block: Implement support for WRITE SAME")
from the block tree and commit 368e564836d3 ("block: makes bio_split
support bio without data") from the md tree.

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

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

diff --cc fs/bio.c
index f855e0e,dbb7a6c..0000000
--- a/fs/bio.c
+++ b/fs/bio.c
@@@ -1485,20 -1511,19 +1485,21 @@@ struct bio_pair *bio_split(struct bio *
  	bp->bio2.bi_size -= first_sectors << 9;
  	bp->bio1.bi_size = first_sectors << 9;
  
- 	bp->bv1 = bi->bi_io_vec[0];
- 	bp->bv2 = bi->bi_io_vec[0];
- 
- 	if (bio_is_rw(bi)) {
- 		bp->bv2.bv_offset += first_sectors << 9;
- 		bp->bv2.bv_len -= first_sectors << 9;
- 		bp->bv1.bv_len = first_sectors << 9;
- 	}
+ 	if (bi->bi_vcnt != 0) {
+ 		bp->bv1 = bi->bi_io_vec[0];
+ 		bp->bv2 = bi->bi_io_vec[0];
 -		bp->bv2.bv_offset += first_sectors << 9;
 -		bp->bv2.bv_len -= first_sectors << 9;
 -		bp->bv1.bv_len = first_sectors << 9;
++		if (bio_is_rw(bi)) {
++			bp->bv2.bv_offset += first_sectors << 9;
++			bp->bv2.bv_len -= first_sectors << 9;
++			bp->bv1.bv_len = first_sectors << 9;
++		}
  
- 	bp->bio1.bi_io_vec = &bp->bv1;
- 	bp->bio2.bi_io_vec = &bp->bv2;
+ 		bp->bio1.bi_io_vec = &bp->bv1;
+ 		bp->bio2.bi_io_vec = &bp->bv2;
  
- 	bp->bio1.bi_max_vecs = 1;
- 	bp->bio2.bi_max_vecs = 1;
+ 		bp->bio1.bi_max_vecs = 1;
+ 		bp->bio2.bi_max_vecs = 1;
+ 	}
  
  	bp->bio1.bi_end_io = bio_pair_end_1;
  	bp->bio2.bi_end_io = bio_pair_end_2;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-09-21  2:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-21  2:49 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-01-15  4:02 Stephen Rothwell
2009-06-10  4:38 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=20120921124955.643dcd503be6cc67f5d1738c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=neilb@suse.de \
    --cc=shli@fusionio.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

all inboxes | Powered by JetHome®