From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Chris Mason <clm@fb•com>,
Josef Bacik <jbacik@fb•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Omar Sandoval <osandov@fb•com>, Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the block tree with the btrfs tree
Date: Mon, 24 Aug 2015 14:16:01 +1000 [thread overview]
Message-ID: <20150824141601.0468d5ed@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/raid56.c
between commit:
b4ee1782686d ("Btrfs: add RAID 5/6 BTRFS_RBIO_REBUILD_MISSING operation")
from the btrfs tree and commit:
4246a0b63bd8 ("block: add a bi_error field to struct bio")
from the block tree.
I fixed it up (using Chris's example merge - see below) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/btrfs/raid56.c
index 6fe2613ef288,0a02e24900aa..000000000000
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@@ -1975,9 -1960,7 +1971,9 @@@ cleanup_io
else
clear_bit(RBIO_CACHE_READY_BIT, &rbio->flags);
- rbio_orig_end_io(rbio, err, err == 0);
+ rbio_orig_end_io(rbio, err);
+ } else if (rbio->operation == BTRFS_RBIO_REBUILD_MISSING) {
- rbio_orig_end_io(rbio, err, err == 0);
++ rbio_orig_end_io(rbio, err);
} else if (err == 0) {
rbio->faila = -1;
rbio->failb = -1;
@@@ -2114,9 -2096,8 +2109,9 @@@ out
return 0;
cleanup:
- if (rbio->operation == BTRFS_RBIO_READ_REBUILD)
+ if (rbio->operation == BTRFS_RBIO_READ_REBUILD ||
+ rbio->operation == BTRFS_RBIO_REBUILD_MISSING)
- rbio_orig_end_io(rbio, -EIO, 0);
+ rbio_orig_end_io(rbio, -EIO);
return -EIO;
}
next reply other threads:[~2015-08-24 4:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 4:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 2:45 linux-next: manual merge of the block tree with the btrfs tree Stephen Rothwell
2023-12-21 5:23 ` Christoph Hellwig
2022-07-15 3:25 Stephen Rothwell
2021-02-02 2:45 Stephen Rothwell
2021-02-14 22:17 ` Stephen Rothwell
2020-12-07 2:44 Stephen Rothwell
2020-07-09 2:58 Stephen Rothwell
2016-06-14 2:44 Stephen Rothwell
2015-08-24 4:16 Stephen Rothwell
2015-08-24 4:15 Stephen Rothwell
2015-08-24 4:15 Stephen Rothwell
2014-01-09 4:01 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=20150824141601.0468d5ed@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=clm@fb$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=jbacik@fb$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=osandov@fb$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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