Hi Philipp,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/block/drbd/drbd_req.c: In function '_drbd_start_io_acct':
drivers/block/drbd/drbd_req.c:45: error: lvalue required as increment operand
drivers/block/drbd/drbd_req.c: In function '_drbd_end_io_acct':
drivers/block/drbd/drbd_req.c:58: error: lvalue required as decrement operand
Caused by commit 954749162c98ca45c42cbc00c9ed6d5d6c0b8bb7 ("DRBD:
request") from the drbd tree interacting with commit
a9327cac440be4d8333bba975cbbf76045096275 ("Seperate read and write
statistics of in_flight requests") from the block tree.
I have applied the following merge fix for today, but there may be a
better fix.
From: Stephen Rothwell <[email protected]>
Date: Tue, 15 Sep 2009 16:03:50 +1000
Subject: [PATCH] drbd: fix for in_flight change in block tree
Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/block/drbd/drbd_req.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index cbdc257..0656cf1 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -42,7 +42,7 @@ static void _drbd_start_io_acct(struct drbd_conf *mdev, struct drbd_request *req
part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
part_stat_unlock();
- mdev->vdisk->part0.in_flight++;
+ mdev->vdisk->part0.in_flight[rw]++;
}
/* Update disk stats when completing request upwards */
@@ -55,7 +55,7 @@ static void _drbd_end_io_acct(struct drbd_conf *mdev, struct drbd_request *req)
part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
part_round_stats(cpu, &mdev->vdisk->part0);
part_stat_unlock();
- mdev->vdisk->part0.in_flight--;
+ mdev->vdisk->part0.in_flight[rw]--;
}
static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const int rw)
--
1.6.3.3
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Tue, Sep 15 2009, Stephen Rothwell wrote:
> Hi Philipp,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/block/drbd/drbd_req.c: In function '_drbd_start_io_acct':
> drivers/block/drbd/drbd_req.c:45: error: lvalue required as increment operand
> drivers/block/drbd/drbd_req.c: In function '_drbd_end_io_acct':
> drivers/block/drbd/drbd_req.c:58: error: lvalue required as decrement operand
>
> Caused by commit 954749162c98ca45c42cbc00c9ed6d5d6c0b8bb7 ("DRBD:
> request") from the drbd tree interacting with commit
> a9327cac440be4d8333bba975cbbf76045096275 ("Seperate read and write
> statistics of in_flight requests") from the block tree.
>
> I have applied the following merge fix for today, but there may be a
> better fix.
Fix looks correct.
--
Jens Axboe
Hi Jens,
On Tue, 15 Sep 2009 08:23:06 +0200 Jens Axboe <[email protected]> wrote:
>
> Fix looks correct.
Thanks for the confirmation. So hopefully one of these trees will be
merged by Linus soon an this can be fixed up in the other.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Tue, Sep 15 2009, Stephen Rothwell wrote:
> Hi Jens,
>
> On Tue, 15 Sep 2009 08:23:06 +0200 Jens Axboe <[email protected]> wrote:
> >
> > Fix looks correct.
>
> Thanks for the confirmation. So hopefully one of these trees will be
> merged by Linus soon an this can be fixed up in the other.
The block one is already merged, so drbd just needs to get fixed up.
--
Jens Axboe
On Tue, 15 Sep 2009 08:57:21 +0200 Jens Axboe <[email protected]> wrote:
>
> The block one is already merged, so drbd just needs to get fixed up.
Right, that happened after I started this morning.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Tuesday 15 September 2009 08:53:09 Stephen Rothwell wrote:
> Hi Jens,
>
> On Tue, 15 Sep 2009 08:23:06 +0200 Jens Axboe <[email protected]> wrote:
> > Fix looks correct.
>
> Thanks for the confirmation. So hopefully one of these trees will be
> merged by Linus soon an this can be fixed up in the other.
Thanks everybody.
I have applied Stephens' patch to the DRBD tree.
-phil