linux-next: build failure after merge of the block tree

Stephen Rothwell
2011-03-07T02:40:01Z

Hi Jens,

After merging the block tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

block/blk-flush.c: In function 'flush_end_io':
block/blk-flush.c:217: error: too few arguments to function '__blk_run_queue'
block/blk-flush.c: In function 'flush_data_end_io':
block/blk-flush.c:271: error: too few arguments to function '__blk_run_queue'

Caused by commit ae1b1539622fb46e51b4d13b3f9e5f4c713f86ae ("block:
reimplement FLUSH/FUA to support merge") interacting with commit
1654e7411a1ad4999fe7890ef51d2a2bbb1fcf76 ("block: add @force_kblockd to
__blk_run_queue()") from Linus' tree. My merge fix up was obviously not
sufficient.

I added this merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Mar 2011 13:27:04 +1100
Subject: [PATCH] block: update for __blk_run_queue() API update

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
block/blk-flush.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk-flush.c b/block/blk-flush.c
index a867e3f..f9b0228 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -214,7 +214,7 @@ static void flush_end_io(struct request *flush_rq, int error)

/* after populating an empty queue, kick it to avoid stall */
if (queued && was_empty)
- __blk_run_queue(q);
+ __blk_run_queue(q, false);
}

/**
@@ -268,7 +268,7 @@ static void flush_data_end_io(struct request *rq, int error)

/* after populating an empty queue, kick it to avoid stall */
if (blk_flush_complete_seq(rq, REQ_FSEQ_DATA, error) && was_empty)
- __blk_run_queue(q);
+ __blk_run_queue(q, false);
}

/**
--
1.7.4.1

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