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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 7 Mar 2011 13:39:57 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>
Subject: linux-next: build failure after merge of the block tree

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@...b.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@...b.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/