Commit 6f6a036e authored Apr 29, 2008 by Adrian Bunk Committed by Jens Axboe Apr 29, 2008

block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline



This patch fixes the following build error with UML and gcc 4.3:

<--  snip  -->

...
  CC      block/blk-barrier.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c: In function ‘blk_do_ordered’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:57: sorry, unimplemented: inlining failed in call to ‘blk_ordered_cur_seq’: function body not available
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:252: sorry, unimplemented: called from here
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:57: sorry, unimplemented: inlining failed in call to ‘blk_ordered_cur_seq’: function body not available
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:253: sorry, unimplemented: called from here
make[2]: *** [block/blk-barrier.o] Error 1

<--  snip  -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

parent 72ed0bf6

block/blk-barrier.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ EXPORT_SYMBOL(blk_queue_ordered);
	/*		/*
	* Cache flushing for ordered writes handling		* Cache flushing for ordered writes handling
	*/		*/
	inline unsigned blk_ordered_cur_seq(struct request_queue *q)		unsigned blk_ordered_cur_seq(struct request_queue *q)
	{		{
	if (!q->ordseq)		if (!q->ordseq)
	return 0;		return 0;

Admin message