2.5.2-pre8: fs/ext3/super.c compile error

2.5.2-pre8: fs/ext3/super.c compile error

[Frank Davis]

Hello all,
  I haven't seen the following posted.
While 'make bzImage', I received the following compile error:
...
super.c: In function 'make_rdonly':
super.c:59: invalid operands to binary !=
super.c:62: invalid operands to binary +
make[3]: *** [super.o] Error 1
make[3]: Leaving directory '/usr/src/linux/fs/ext3'
...

Regards,
Frank

Re: 2.5.2-pre8: fs/ext3/super.c compile error

[Andrew Morton]

Frank Davis wrote:
> 
> Hello all,
>   I haven't seen the following posted.
> While 'make bzImage', I received the following compile error:
> ...
> super.c: In function 'make_rdonly':
> super.c:59: invalid operands to binary !=
> super.c:62: invalid operands to binary +
> make[3]: *** [super.o] Error 1
> make[3]: Leaving directory '/usr/src/linux/fs/ext3'
> ...

This is a piece of debug code - it's enabled by CONFIG_JBD_DEBUG,
and you can just disable that option to make the error go away.

The code in question is designed to tell the disk device driver
to start silently discarding all writes to the underlying device a
certain number of seconds after the filesystem is mounted.  This simulates
a machine crash.  It is for scripted crash+recovery testing.

The fix is:

--- linux-2.5.2-pre7/fs/ext3/super.c	Fri Jan  4 18:48:43 2002
+++ 25/fs/ext3/super.c	Fri Jan  4 22:22:03 2002
@@ -56,10 +56,10 @@ int journal_no_write[2];
 
 static void make_rdonly(kdev_t dev, int *no_write)
 {
-	if (dev) {
+	if (kdev_val(dev)) {
 		printk(KERN_WARNING "Turning device %s read-only\n", 
 		       bdevname(dev));
-		*no_write = 0xdead0000 + dev;
+		*no_write = 0xdead0000 + kdev_val(dev);
 	}
 }