[Hackndev-commit] SF.net SVN: hackndev: [919] linux4palm/linux/trunk/init/do_mounts_rd.c

[<mar...@us...>]

Revision: 919
          http://svn.sourceforge.net/hackndev/?rev=919&view=rev
Author:   marex_z71
Date:     2007-03-18 12:18:56 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
l4p: add few more ifdefs for squashfs-lzma

Modified Paths:
--------------
    linux4palm/linux/trunk/init/do_mounts_rd.c

Modified: linux4palm/linux/trunk/init/do_mounts_rd.c
===================================================================
--- linux4palm/linux/trunk/init/do_mounts_rd.c	2007-03-18 12:28:29 UTC (rev 918)
+++ linux4palm/linux/trunk/init/do_mounts_rd.c	2007-03-18 19:18:56 UTC (rev 919)
@@ -64,7 +64,9 @@
 	struct romfs_super_block *romfsb;
 	struct cramfs_super *cramfsb;
 	struct squashfs_super_block *squashfsb;
+#ifdef CONFIG_SQUASHFS_LZMA
 	struct squashfs_super_block *squashfslzmab;
+#endif
 
 	int nblocks = -1;
 	unsigned char *buf;
@@ -78,7 +80,9 @@
 	romfsb = (struct romfs_super_block *) buf;
 	cramfsb = (struct cramfs_super *) buf;
 	squashfsb = (struct squashfs_super_block *) buf;
+#ifdef CONFIG_SQUASHFS_LZMA
 	squashfslzmab = (struct squashfs_super_block *) buf;
+#endif
 	memset(buf, 0xe5, size);
 
 	/*
@@ -128,6 +132,7 @@
 		goto done;
 	}
 
+#ifdef CONFIG_SQUASHFS_LZMA
 	/* squashfslzma is at block zero too */ 
 	if (squashfslzmab->s_magic == SQUASHFS_MAGIC_LZMA) {
 		printk(KERN_NOTICE
@@ -139,6 +144,7 @@
 			nblocks = (squashfslzmab->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
 		goto done;
 	}
+#endif
 
 	/*
 	 * Read block 1 to test for minix and ext2 superblock


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.