/[linux-patches]/genpatches-2.6/trunk/2.6.22-pre/4300_squashfs-3.2.patch
Gentoo

Diff of /genpatches-2.6/trunk/2.6.22-pre/4300_squashfs-3.2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

genpatches-2.6/trunk/2.6.21/4300_squashfs-3.2.patch Revision 956 genpatches-2.6/trunk/2.6.22-pre/4300_squashfs-3.2.patch Revision 963
1Index: linux-2.6.21/fs/Kconfig 1---
2=================================================================== 2 fs/Kconfig | 65 +
3--- linux-2.6.21.orig/fs/Kconfig 3 fs/Makefile | 1
4+++ linux-2.6.21/fs/Kconfig 4 fs/squashfs/Makefile | 7
5 fs/squashfs/inode.c | 2328 +++++++++++++++++++++++++++++++++++++++++
6 fs/squashfs/squashfs.h | 87 +
7 fs/squashfs/squashfs2_0.c | 757 +++++++++++++
8 include/linux/squashfs_fs.h | 934 ++++++++++++++++
9 include/linux/squashfs_fs_i.h | 45
10 include/linux/squashfs_fs_sb.h | 74 +
11 init/do_mounts_rd.c | 16
12 10 files changed, 4314 insertions(+)
13
14--- a/fs/Kconfig
15+++ b/fs/Kconfig
5@@ -1371,6 +1371,71 @@ config CRAMFS 16@@ -1367,6 +1367,71 @@ config CRAMFS
6 17
7 If unsure, say N. 18 If unsure, say N.
8 19
9+config SQUASHFS 20+config SQUASHFS
10+ tristate "SquashFS 3.2 - Squashed file system support" 21+ tristate "SquashFS 3.2 - Squashed file system support"
72+ If unsure, say N. 83+ If unsure, say N.
73+ 84+
74 config VXFS_FS 85 config VXFS_FS
75 tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" 86 tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
76 depends on BLOCK 87 depends on BLOCK
77Index: linux-2.6.21/fs/Makefile 88--- a/fs/Makefile
78=================================================================== 89+++ b/fs/Makefile
79--- linux-2.6.21.orig/fs/Makefile
80+++ linux-2.6.21/fs/Makefile
81@@ -68,6 +68,7 @@ obj-$(CONFIG_JBD) += jbd/ 90@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD) += jbd/
82 obj-$(CONFIG_JBD2) += jbd2/ 91 obj-$(CONFIG_JBD2) += jbd2/
83 obj-$(CONFIG_EXT2_FS) += ext2/ 92 obj-$(CONFIG_EXT2_FS) += ext2/
84 obj-$(CONFIG_CRAMFS) += cramfs/ 93 obj-$(CONFIG_CRAMFS) += cramfs/
85+obj-$(CONFIG_SQUASHFS) += squashfs/ 94+obj-$(CONFIG_SQUASHFS) += squashfs/
86 obj-$(CONFIG_RAMFS) += ramfs/ 95 obj-$(CONFIG_RAMFS) += ramfs/
87 obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ 96 obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
88 obj-$(CONFIG_CODA_FS) += coda/ 97 obj-$(CONFIG_CODA_FS) += coda/
89Index: linux-2.6.21/fs/squashfs/Makefile
90===================================================================
91--- /dev/null 98--- /dev/null
92+++ linux-2.6.21/fs/squashfs/Makefile 99+++ b/fs/squashfs/Makefile
93@@ -0,0 +1,7 @@ 100@@ -0,0 +1,7 @@
94+# 101+#
95+# Makefile for the linux squashfs routines. 102+# Makefile for the linux squashfs routines.
96+# 103+#
97+ 104+
98+obj-$(CONFIG_SQUASHFS) += squashfs.o 105+obj-$(CONFIG_SQUASHFS) += squashfs.o
99+squashfs-y += inode.o 106+squashfs-y += inode.o
100+squashfs-y += squashfs2_0.o 107+squashfs-y += squashfs2_0.o
101Index: linux-2.6.21/fs/squashfs/inode.c
102===================================================================
103--- /dev/null 108--- /dev/null
104+++ linux-2.6.21/fs/squashfs/inode.c 109+++ b/fs/squashfs/inode.c
105@@ -0,0 +1,2328 @@ 110@@ -0,0 +1,2328 @@
106+/* 111+/*
107+ * Squashfs - a compressed read only filesystem for Linux 112+ * Squashfs - a compressed read only filesystem for Linux
108+ * 113+ *
109+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 114+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
2429+module_init(init_squashfs_fs); 2434+module_init(init_squashfs_fs);
2430+module_exit(exit_squashfs_fs); 2435+module_exit(exit_squashfs_fs);
2431+MODULE_DESCRIPTION("squashfs 3.2, a compressed read-only filesystem"); 2436+MODULE_DESCRIPTION("squashfs 3.2, a compressed read-only filesystem");
2432+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>"); 2437+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
2433+MODULE_LICENSE("GPL"); 2438+MODULE_LICENSE("GPL");
2434Index: linux-2.6.21/fs/squashfs/squashfs.h
2435===================================================================
2436--- /dev/null 2439--- /dev/null
2437+++ linux-2.6.21/fs/squashfs/squashfs.h 2440+++ b/fs/squashfs/squashfs.h
2438@@ -0,0 +1,87 @@ 2441@@ -0,0 +1,87 @@
2439+/* 2442+/*
2440+ * Squashfs - a compressed read only filesystem for Linux 2443+ * Squashfs - a compressed read only filesystem for Linux
2441+ * 2444+ *
2442+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 2445+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
2521+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk) 2524+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
2522+{ 2525+{
2523+ return 0; 2526+ return 0;
2524+} 2527+}
2525+#endif 2528+#endif
2526Index: linux-2.6.21/fs/squashfs/squashfs2_0.c
2527===================================================================
2528--- /dev/null 2529--- /dev/null
2529+++ linux-2.6.21/fs/squashfs/squashfs2_0.c 2530+++ b/fs/squashfs/squashfs2_0.c
2530@@ -0,0 +1,757 @@ 2531@@ -0,0 +1,757 @@
2531+/* 2532+/*
2532+ * Squashfs - a compressed read only filesystem for Linux 2533+ * Squashfs - a compressed read only filesystem for Linux
2533+ * 2534+ *
2534+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 2535+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
3283+ sblk->directory_table_start = sblk->directory_table_start_2; 3284+ sblk->directory_table_start = sblk->directory_table_start_2;
3284+ sblk->fragment_table_start = sblk->fragment_table_start_2; 3285+ sblk->fragment_table_start = sblk->fragment_table_start_2;
3285+ 3286+
3286+ return 1; 3287+ return 1;
3287+} 3288+}
3288Index: linux-2.6.21/include/linux/squashfs_fs.h
3289===================================================================
3290--- /dev/null 3289--- /dev/null
3291+++ linux-2.6.21/include/linux/squashfs_fs.h 3290+++ b/include/linux/squashfs_fs.h
3292@@ -0,0 +1,934 @@ 3291@@ -0,0 +1,934 @@
3293+#ifndef SQUASHFS_FS 3292+#ifndef SQUASHFS_FS
3294+#define SQUASHFS_FS 3293+#define SQUASHFS_FS
3295+ 3294+
3296+/* 3295+/*
4222+ 4221+
4223+#define SQUASHFS_MEMSET(s, d, n) memset(s, 0, n); 4222+#define SQUASHFS_MEMSET(s, d, n) memset(s, 0, n);
4224+ 4223+
4225+#endif 4224+#endif
4226+#endif 4225+#endif
4227Index: linux-2.6.21/include/linux/squashfs_fs_i.h
4228===================================================================
4229--- /dev/null 4226--- /dev/null
4230+++ linux-2.6.21/include/linux/squashfs_fs_i.h 4227+++ b/include/linux/squashfs_fs_i.h
4231@@ -0,0 +1,45 @@ 4228@@ -0,0 +1,45 @@
4232+#ifndef SQUASHFS_FS_I 4229+#ifndef SQUASHFS_FS_I
4233+#define SQUASHFS_FS_I 4230+#define SQUASHFS_FS_I
4234+/* 4231+/*
4235+ * Squashfs 4232+ * Squashfs
4272+ } s2; 4269+ } s2;
4273+ } u; 4270+ } u;
4274+ struct inode vfs_inode; 4271+ struct inode vfs_inode;
4275+}; 4272+};
4276+#endif 4273+#endif
4277Index: linux-2.6.21/include/linux/squashfs_fs_sb.h
4278===================================================================
4279--- /dev/null 4274--- /dev/null
4280+++ linux-2.6.21/include/linux/squashfs_fs_sb.h 4275+++ b/include/linux/squashfs_fs_sb.h
4281@@ -0,0 +1,74 @@ 4276@@ -0,0 +1,74 @@
4282+#ifndef SQUASHFS_FS_SB 4277+#ifndef SQUASHFS_FS_SB
4283+#define SQUASHFS_FS_SB 4278+#define SQUASHFS_FS_SB
4284+/* 4279+/*
4285+ * Squashfs 4280+ * Squashfs
4351+ index, int readahead_blks, char *block_list, \ 4346+ index, int readahead_blks, char *block_list, \
4352+ unsigned short **block_p, unsigned int *bsize); 4347+ unsigned short **block_p, unsigned int *bsize);
4353+ int (*read_fragment_index_table)(struct super_block *s); 4348+ int (*read_fragment_index_table)(struct super_block *s);
4354+}; 4349+};
4355+#endif 4350+#endif
4356Index: linux-2.6.21/init/do_mounts_rd.c 4351--- a/init/do_mounts_rd.c
4357===================================================================
4358--- linux-2.6.21.orig/init/do_mounts_rd.c
4359+++ linux-2.6.21/init/do_mounts_rd.c 4352+++ b/init/do_mounts_rd.c
4360@@ -5,6 +5,7 @@ 4353@@ -5,6 +5,7 @@
4361 #include <linux/ext2_fs.h> 4354 #include <linux/ext2_fs.h>
4362 #include <linux/romfs_fs.h> 4355 #include <linux/romfs_fs.h>
4363 #include <linux/cramfs_fs.h> 4356 #include <linux/cramfs_fs.h>
4364+#include <linux/squashfs_fs.h> 4357+#include <linux/squashfs_fs.h>

Legend:
Removed from v.956  
changed lines
  Added in v.963

  ViewVC Help
Powered by ViewVC 1.1.20