Re: 2.4.10-pre5

[Peter Osterlund]

"Garst R. Reese" <[e-mail]> writes:

> Garstmake[2]: Entering directory `/usr/src/linux/drivers/block'
> gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i586 -DMODULE   -c -o rd.o rd.c
> rd.c: In function `rd_ioctl':
> rd.c:262: invalid type argument of `->'
> rd.c: In function `rd_cleanup':
> rd.c:375: too few arguments to function `blkdev_put'
> make[2]: *** [rd.o] Error 1
> make[2]: Leaving directory `/usr/src/linux/drivers/block'
> make[1]: *** [_modsubdir_block] Error 2
> make[1]: Leaving directory `/usr/src/linux/drivers'
> make: *** [_mod_drivers] Error 2
> Command exited with non-zero status 2

This patch seems to work:

--- linux/drivers/block/rd.c.orig	Sat Sep  8 11:58:19 2001
+++ linux/drivers/block/rd.c	Sat Sep  8 12:21:50 2001
@@ -259,7 +259,7 @@
 			/* special: we want to release the ramdisk memory,
 			   it's not like with the other blockdevices where
 			   this ioctl only flushes away the buffer cache. */
-			if ((atomic_read(rd_bdev[minor]->bd_openers) > 2))
+			if ((atomic_read(&rd_bdev[minor]->bd_openers) > 2))
 				return -EBUSY;
 			destroy_buffers(inode->i_rdev);
 			rd_blocksizes[minor] = 0;
@@ -372,7 +372,7 @@
 		struct block_device *bdev = rd_bdev[i];
 		rd_bdev[i] = NULL;
 		if (bdev) {
-			blkdev_put(bdev);
+			blkdev_put(bdev, BDEV_FILE);
 			bdput(bdev);
 		}
 		destroy_buffers(MKDEV(MAJOR_NR, i));

-- 
Peter Österlund             [e-mail]
Sköndalsvägen 35            http://w1.894.telia.com/~u89404340
S-128 66 Sköndal            [phone]
Sweden