From 16230964dde5847a21393217782b6dbb2c957db9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sat, 7 Aug 2010 10:31:21 +0200 Subject: squashfs3: don't try to mount newer filesystems --- fs/squashfs3/inode.c | 4 +--- init/do_mounts_rd.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/squashfs3/inode.c b/fs/squashfs3/inode.c index f5057c6..18af1a9 100644 --- a/fs/squashfs3/inode.c +++ b/fs/squashfs3/inode.c @@ -1079,9 +1079,7 @@ static int supported_squashfs3_filesystem(struct squashfs3_sb_info *msblk, int s } } else if(sblk->s_major != SQUASHFS3_MAJOR || sblk->s_minor > SQUASHFS3_MINOR) { - SERROR("Major/Minor mismatch, trying to mount newer %d.%d " - "filesystem\n", sblk->s_major, sblk->s_minor); - SERROR("Please update your kernel\n"); + SERROR("Squashfs3: ignoring Squashfs %d.%d filesystem\n", sblk->s_major, sblk->s_minor); return 0; } diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index 99c1b91..1c1a9f6 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -104,7 +104,7 @@ identify_ramdisk_image(int fd, int start_block) } /* squashfs3 is at block zero too */ - if (squashfs3sb->s_magic == SQUASHFS3_MAGIC) { + if (squashfs3sb->s_magic == SQUASHFS3_MAGIC && squashfs3sb->s_major <= 3) { printk(KERN_NOTICE "RAMDISK: squashfs3 filesystem found at block %d\n", start_block); -- 1.6.4.4