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>
Subject: linux-next: build failure after merge of the md tree
Date: Wed, 14 Jun 2017 11:58:21 +1000 [thread overview]
Message-ID: <20170614115821.636bee1d@canb.auug.org.au> (raw)
Hi Shaohua,
After merging the md tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/md/raid1.c: In function 'raid1_write_request':
drivers/md/raid1.c:1359:7: error: 'struct bio' has no member named 'bi_error'
bio->bi_error = -ETIMEDOUT;
^
drivers/md/raid5.c: In function 'raid5_make_request':
drivers/md/raid5.c:5712:8: error: 'struct bio' has no member named 'bi_error'
bi->bi_error = -ETIMEDOUT;
^
Caused by commit
261eb8c4c5a8 ("md: make suspend range wait timed out")
interacting with commit
4e4cbee93d56 ("block: switch bios to blk_status_t")
from the block tree.
I applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 14 Jun 2017 11:54:37 +1000
Subject: [PATCH] md: fixup for "block: switch bios to blk_status_t"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/md/raid1.c | 2 +-
drivers/md/raid5.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e320138916cc..db2ad0eeef22 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1356,7 +1356,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
if (remaining == 0) {
pr_err("md/raid1:%s: suspend range is locked\n",
mdname(mddev));
- bio->bi_error = -ETIMEDOUT;
+ bio->bi_status = BLK_STS_TIMEOUT;
bio_endio(bio);
return;
}
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2a6634b7357b..3b3005c87b4b 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5709,7 +5709,7 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi)
if (remaining == 0) {
pr_err("md/raid5:%s: suspend range is locked\n",
mdname(mddev));
- bi->bi_error = -ETIMEDOUT;
+ bi->bi_status = BLK_STS_TIMEOUT;
break;
}
goto retry;
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-06-14 1:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 1:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-22 1:44 linux-next: build failure after merge of the md tree Stephen Rothwell
2017-07-03 1:52 ` Stephen Rothwell
2015-03-02 5:50 Stephen Rothwell
2015-03-02 6:03 ` NeilBrown
2015-03-02 6:11 ` Stephen Rothwell
2015-03-03 2:35 ` Stephen Rothwell
2015-03-04 2:44 ` NeilBrown
2015-03-04 2:48 ` Stephen Rothwell
2015-03-13 8:55 ` Guoqing Jiang
2012-09-25 3:31 Stephen Rothwell
2012-09-25 4:10 ` NeilBrown
2012-09-25 4:50 ` Stephen Rothwell
2012-04-19 2:55 Stephen Rothwell
2012-04-19 3:15 ` NeilBrown
2012-04-11 3:42 Stephen Rothwell
2012-04-11 3:54 ` H. Peter Anvin
2012-04-11 4:48 ` NeilBrown
2012-03-28 3:32 Stephen Rothwell
2012-03-28 4:07 ` NeilBrown
2011-10-11 5:29 Stephen Rothwell
2011-10-11 5:42 ` NeilBrown
2011-10-07 3:07 Stephen Rothwell
2011-10-07 3:34 ` NeilBrown
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=20170614115821.636bee1d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shli@kernel$(echo .)org \
/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