Re: 2.5.69-mjb1: undefined reference to `blk_queue_empty'

[Bharata B Rao]

On Mon, May 12, 2003 at 08:51:05PM -0700, Martin J. Bligh wrote:
> 
> --Adrian Bunk <[e-mail]> wrote (on Monday, May 12, 2003 22:51:40 +0200):
> 
> > <--  snip  -->
> > 
> > ...
> >   gcc -Wp,-MD,drivers/dump/.dump_blockdev.o.d -D__KERNEL__ -Iinclude 
> > -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe 
> > -mpreferred-stack-boundary=2 -march=k6 -Iinclude/asm-i386/mach-default 
> > -fomit-frame-pointer -nostdinc -iwithprefix include    -DKBUILD_BASENAME=dump_blockdev 
> > \-DKBUILD_MODNAME=dump_blockdev -c -o drivers/dump/dump_blockdev.o 
> > drivers/dump/dump_blockdev.c
> > drivers/dump/dump_blockdev.c: In function `dump_block_silence':
> > drivers/dump/dump_blockdev.c:264: warning: implicit declaration of function `blk_queue_empty'
> > ...
> > 386/oprofile/built-in.o  net/built-in.o --end-group  -o .tmp_vmlinux1
> > drivers/built-in.o(.text+0x77edaf): In function `dump_block_silence':
> > : undefined reference to `blk_queue_empty'
> > ...
> > make: *** [.tmp_vmlinux1] Error 1
> > 
> > <--  snip  -->
> > 
> > This is the only occurence of blk_queue_empty in the whole kernel tree.
> 
> Thanks Adrian ... this is LKCD stuff, maybe Suparna / Bharata can fix it?
> Looks like it disappeared in 2.5.67 or so.
> 

Martin,

I have already sent you a fix for this. Anyway here it is again.

--- linux-2.5.69/drivers/dump/dump_blockdev.c.orig	Tue May 13 12:30:49 2003
+++ linux-2.5.69/drivers/dump/dump_blockdev.c	Tue May 13 12:34:09 2003
@@ -261,7 +261,7 @@
 
 	/* For now we assume we have the device to ourselves */
 	/* Just a quick sanity check */
-	if (!blk_queue_empty(bdev_get_queue(dump_bdev->bdev))) {
+	if (elv_next_request(bdev_get_queue(dump_bdev->bdev))) {
 		/* i/o in flight - safer to quit */
 		return -EBUSY;
 	}

Regards,
Bharata.