[openap-cvs] : linux/drivers/block rd.c,1.1.1.1,1.2

[David C Wang <address@hidden>]

Update of /cvsroot/openap/linux/drivers/block
In directory subversions:/tmp/cvs-serv5742/drivers/block

Modified Files:
        rd.c 
Log Message:
updated linux kernel pristine sources to openap release 1.1



Index: rd.c
===================================================================
RCS file: /cvsroot/openap/linux/drivers/block/rd.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rd.c        14 May 2002 18:44:36 -0000      1.1.1.1
+++ rd.c        14 May 2002 19:53:30 -0000      1.2
@@ -47,6 +47,7 @@
 #include <linux/minix_fs.h>
 #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
+#include <linux/cramfs_fs.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/hdreg.h>
@@ -571,6 +572,7 @@
        struct minix_super_block *minixsb;
        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
+       struct cramfs_super *cramfsb;
        int nblocks = -1;
        unsigned char *buf;
 
@@ -581,6 +583,7 @@
        minixsb = (struct minix_super_block *) buf;
        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
+       cramfsb = (struct cramfs_super *) buf;
        memset(buf, 0xe5, size);
 
        /*
@@ -610,6 +613,15 @@
                       "RAMDISK: romfs filesystem found at block %d\n",
                       start_block);
                nblocks = (ntohl(romfsb->size)+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
+               goto done;
+       }
+
+       /* so is cramfs */
+       if (cramfsb->magic == CRAMFS_MAGIC) {
+               printk(KERN_NOTICE
+                      "RAMDISK: cramfs filesystem found at block %d\n",
+                      start_block);
+               nblocks = (cramfsb->size+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
                goto done;
        }