aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2011-02-14 01:57:20 +0000
committerMohamad Ayyash <mkayyash@google.com>2015-02-23 12:35:01 -0800
commitf3ef6b21063e8e43d5c2e4313582f7b6546e09dd (patch)
tree37963575213b0a041bcba062fa309c65738bea91 /kernel
parentbf1ad241aee59b57cbb19e80171c147c88f825fd (diff)
downloadsquashfs-tools-f3ef6b21063e8e43d5c2e4313582f7b6546e09dd.tar.gz
Update README and get rid of some obsolete files in kernel/
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/linux-2.6.22.patch157
-rw-r--r--kernel/linux-2.6.23.patch147
-rw-r--r--kernel/linux-2.6.24.patch138
3 files changed, 0 insertions, 442 deletions
diff --git a/kernel/linux-2.6.22.patch b/kernel/linux-2.6.22.patch
deleted file mode 100644
index 30ba1d4..0000000
--- a/kernel/linux-2.6.22.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -Naurp linux-post-2.6.24/fs/squashfs/inode.c linux-pre-2.6.25/fs/squashfs/inode.c
---- linux-post-2.6.24/fs/squashfs/inode.c 2008-06-13 00:45:31.000000000 +0100
-+++ linux-pre-2.6.25/fs/squashfs/inode.c 2008-06-13 00:46:27.000000000 +0100
-@@ -32,14 +32,10 @@
- #include <linux/vmalloc.h>
- #include <linux/spinlock.h>
- #include <linux/smp_lock.h>
--#include <linux/exportfs.h>
-
- #include "squashfs.h"
-
--static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type);
--static struct dentry *squashfs_fh_to_parent(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type);
-+static void vfs_read_inode(struct inode *i);
- static struct dentry *squashfs_get_parent(struct dentry *child);
- static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode);
- static int squashfs_statfs(struct dentry *, struct kstatfs *);
-@@ -80,9 +76,15 @@ static struct super_operations squashfs_
- .remount_fs = squashfs_remount
- };
-
-+static struct super_operations squashfs_export_super_ops = {
-+ .alloc_inode = squashfs_alloc_inode,
-+ .destroy_inode = squashfs_destroy_inode,
-+ .statfs = squashfs_statfs,
-+ .put_super = squashfs_put_super,
-+ .read_inode = vfs_read_inode
-+};
-+
- static struct export_operations squashfs_export_ops = {
-- .fh_to_dentry = squashfs_fh_to_dentry,
-- .fh_to_parent = squashfs_fh_to_parent,
- .get_parent = squashfs_get_parent
- };
-
-@@ -631,72 +633,42 @@ static squashfs_inode_t squashfs_inode_l
- out:
- return SQUASHFS_INVALID_BLK;
- }
-+
-
--
--
--static struct dentry *squashfs_export_iget(struct super_block *s,
-- unsigned int inode_number)
--{
-- squashfs_inode_t inode;
-- struct inode *i;
-- struct dentry *dentry;
--
-- TRACE("Entered squashfs_export_iget\n");
--
-- inode = squashfs_inode_lookup(s, inode_number);
-- if(inode == SQUASHFS_INVALID_BLK) {
-- dentry = ERR_PTR(-ENOENT);
-- goto failure;
-- }
--
-- i = squashfs_iget(s, inode, inode_number);
-- if(i == NULL) {
-- dentry = ERR_PTR(-EACCES);
-- goto failure;
-- }
--
-- dentry = d_alloc_anon(i);
-- if (dentry == NULL) {
-- iput(i);
-- dentry = ERR_PTR(-ENOMEM);
-- }
--
--failure:
-- return dentry;
--}
--
--
--static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type)
-+static void vfs_read_inode(struct inode *i)
- {
-- if((fh_type != FILEID_INO32_GEN && fh_type != FILEID_INO32_GEN_PARENT) ||
-- fh_len < 2)
-- return NULL;
--
-- return squashfs_export_iget(s, fid->i32.ino);
--}
-+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+ squashfs_inode_t inode = squashfs_inode_lookup(i->i_sb, i->i_ino);
-
-+ TRACE("Entered vfs_read_inode\n");
-
--static struct dentry *squashfs_fh_to_parent(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type)
--{
-- if(fh_type != FILEID_INO32_GEN_PARENT || fh_len < 4)
-- return NULL;
--
-- return squashfs_export_iget(s, fid->i32.parent_ino);
-+ if(inode != SQUASHFS_INVALID_BLK)
-+ (msblk->read_inode)(i, inode);
- }
-
-
- static struct dentry *squashfs_get_parent(struct dentry *child)
- {
- struct inode *i = child->d_inode;
-+ struct inode *parent = iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
-+ struct dentry *rv;
-
- TRACE("Entered squashfs_get_parent\n");
-
-- return squashfs_export_iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
--}
-+ if(parent == NULL) {
-+ rv = ERR_PTR(-EACCES);
-+ goto out;
-+ }
-
-+ rv = d_alloc_anon(parent);
-+ if(rv == NULL)
-+ rv = ERR_PTR(-ENOMEM);
-
-+out:
-+ return rv;
-+}
-+
-+
- SQSH_EXTERN struct inode *squashfs_iget(struct super_block *s,
- squashfs_inode_t inode, unsigned int inode_number)
- {
-@@ -1247,6 +1219,7 @@ static int squashfs_fill_super(struct su
- if (read_inode_lookup_table(s) == 0)
- goto failed_mount;
-
-+ s->s_op = &squashfs_export_super_ops;
- s->s_export_op = &squashfs_export_ops;
-
- allocate_root:
-@@ -2141,7 +2114,7 @@ static void squashfs_destroy_inode(struc
- }
-
-
--static void init_once(struct kmem_cache *cachep, void *foo)
-+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
- {
- struct squashfs_inode_info *ei = foo;
-
-@@ -2153,7 +2126,7 @@ static int __init init_inodecache(void)
- {
- squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache",
- sizeof(struct squashfs_inode_info), 0,
-- SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT, init_once);
-+ SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT, init_once, NULL);
- if (squashfs_inode_cachep == NULL)
- return -ENOMEM;
- return 0;
diff --git a/kernel/linux-2.6.23.patch b/kernel/linux-2.6.23.patch
deleted file mode 100644
index 1c56b58..0000000
--- a/kernel/linux-2.6.23.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Naurp linux-post-2.6.24/fs/squashfs/inode.c linux-pre-2.6.25/fs/squashfs/inode.c
---- linux-post-2.6.24/fs/squashfs/inode.c 2008-06-13 00:45:31.000000000 +0100
-+++ linux-pre-2.6.25/fs/squashfs/inode.c 2008-06-13 00:46:27.000000000 +0100
-@@ -32,14 +32,10 @@
- #include <linux/vmalloc.h>
- #include <linux/spinlock.h>
- #include <linux/smp_lock.h>
-
- #include "squashfs.h"
-
--static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type);
--static struct dentry *squashfs_fh_to_parent(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type);
-+static void vfs_read_inode(struct inode *i);
- static struct dentry *squashfs_get_parent(struct dentry *child);
- static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode);
- static int squashfs_statfs(struct dentry *, struct kstatfs *);
-@@ -80,9 +76,15 @@ static struct super_operations squashfs_
- .remount_fs = squashfs_remount
- };
-
-+static struct super_operations squashfs_export_super_ops = {
-+ .alloc_inode = squashfs_alloc_inode,
-+ .destroy_inode = squashfs_destroy_inode,
-+ .statfs = squashfs_statfs,
-+ .put_super = squashfs_put_super,
-+ .read_inode = vfs_read_inode
-+};
-+
- static struct export_operations squashfs_export_ops = {
-- .fh_to_dentry = squashfs_fh_to_dentry,
-- .fh_to_parent = squashfs_fh_to_parent,
- .get_parent = squashfs_get_parent
- };
-
-@@ -631,72 +633,42 @@ static squashfs_inode_t squashfs_inode_l
- out:
- return SQUASHFS_INVALID_BLK;
- }
-+
-
--
--
--static struct dentry *squashfs_export_iget(struct super_block *s,
-- unsigned int inode_number)
--{
-- squashfs_inode_t inode;
-- struct inode *i;
-- struct dentry *dentry;
--
-- TRACE("Entered squashfs_export_iget\n");
--
-- inode = squashfs_inode_lookup(s, inode_number);
-- if(inode == SQUASHFS_INVALID_BLK) {
-- dentry = ERR_PTR(-ENOENT);
-- goto failure;
-- }
--
-- i = squashfs_iget(s, inode, inode_number);
-- if(i == NULL) {
-- dentry = ERR_PTR(-EACCES);
-- goto failure;
-- }
--
-- dentry = d_alloc_anon(i);
-- if (dentry == NULL) {
-- iput(i);
-- dentry = ERR_PTR(-ENOMEM);
-- }
--
--failure:
-- return dentry;
--}
--
--
--static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type)
-+static void vfs_read_inode(struct inode *i)
- {
-- if((fh_type != FILEID_INO32_GEN && fh_type != FILEID_INO32_GEN_PARENT) ||
-- fh_len < 2)
-- return NULL;
--
-- return squashfs_export_iget(s, fid->i32.ino);
--}
-+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+ squashfs_inode_t inode = squashfs_inode_lookup(i->i_sb, i->i_ino);
-
-+ TRACE("Entered vfs_read_inode\n");
-
--static struct dentry *squashfs_fh_to_parent(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type)
--{
-- if(fh_type != FILEID_INO32_GEN_PARENT || fh_len < 4)
-- return NULL;
--
-- return squashfs_export_iget(s, fid->i32.parent_ino);
-+ if(inode != SQUASHFS_INVALID_BLK)
-+ (msblk->read_inode)(i, inode);
- }
-
-
- static struct dentry *squashfs_get_parent(struct dentry *child)
- {
- struct inode *i = child->d_inode;
-+ struct inode *parent = iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
-+ struct dentry *rv;
-
- TRACE("Entered squashfs_get_parent\n");
-
-- return squashfs_export_iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
--}
-+ if(parent == NULL) {
-+ rv = ERR_PTR(-EACCES);
-+ goto out;
-+ }
-
-+ rv = d_alloc_anon(parent);
-+ if(rv == NULL)
-+ rv = ERR_PTR(-ENOMEM);
-
-+out:
-+ return rv;
-+}
-+
-+
- SQSH_EXTERN struct inode *squashfs_iget(struct super_block *s,
- squashfs_inode_t inode, unsigned int inode_number)
- {
-@@ -1247,6 +1219,7 @@ static int squashfs_fill_super(struct su
- if (read_inode_lookup_table(s) == 0)
- goto failed_mount;
-
-+ s->s_op = &squashfs_export_super_ops;
- s->s_export_op = &squashfs_export_ops;
-
- allocate_root:
-@@ -2141,7 +2114,7 @@ static void squashfs_destroy_inode(struc
- }
-
-
--static void init_once(struct kmem_cache *cachep, void *foo)
-+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
- {
- struct squashfs_inode_info *ei = foo;
-
diff --git a/kernel/linux-2.6.24.patch b/kernel/linux-2.6.24.patch
deleted file mode 100644
index 3877c68..0000000
--- a/kernel/linux-2.6.24.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naurp linux-post-2.6.24/fs/squashfs/inode.c linux-pre-2.6.25/fs/squashfs/inode.c
---- linux-post-2.6.24/fs/squashfs/inode.c 2008-06-13 00:45:31.000000000 +0100
-+++ linux-pre-2.6.25/fs/squashfs/inode.c 2008-06-13 00:46:27.000000000 +0100
-@@ -32,14 +32,10 @@
- #include <linux/vmalloc.h>
- #include <linux/spinlock.h>
- #include <linux/smp_lock.h>
-
- #include "squashfs.h"
-
--static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type);
--static struct dentry *squashfs_fh_to_parent(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type);
-+static void vfs_read_inode(struct inode *i);
- static struct dentry *squashfs_get_parent(struct dentry *child);
- static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode);
- static int squashfs_statfs(struct dentry *, struct kstatfs *);
-@@ -80,9 +76,15 @@ static struct super_operations squashfs_
- .remount_fs = squashfs_remount
- };
-
-+static struct super_operations squashfs_export_super_ops = {
-+ .alloc_inode = squashfs_alloc_inode,
-+ .destroy_inode = squashfs_destroy_inode,
-+ .statfs = squashfs_statfs,
-+ .put_super = squashfs_put_super,
-+ .read_inode = vfs_read_inode
-+};
-+
- static struct export_operations squashfs_export_ops = {
-- .fh_to_dentry = squashfs_fh_to_dentry,
-- .fh_to_parent = squashfs_fh_to_parent,
- .get_parent = squashfs_get_parent
- };
-
-@@ -631,72 +633,42 @@ static squashfs_inode_t squashfs_inode_l
- out:
- return SQUASHFS_INVALID_BLK;
- }
-+
-
--
--
--static struct dentry *squashfs_export_iget(struct super_block *s,
-- unsigned int inode_number)
--{
-- squashfs_inode_t inode;
-- struct inode *i;
-- struct dentry *dentry;
--
-- TRACE("Entered squashfs_export_iget\n");
--
-- inode = squashfs_inode_lookup(s, inode_number);
-- if(inode == SQUASHFS_INVALID_BLK) {
-- dentry = ERR_PTR(-ENOENT);
-- goto failure;
-- }
--
-- i = squashfs_iget(s, inode, inode_number);
-- if(i == NULL) {
-- dentry = ERR_PTR(-EACCES);
-- goto failure;
-- }
--
-- dentry = d_alloc_anon(i);
-- if (dentry == NULL) {
-- iput(i);
-- dentry = ERR_PTR(-ENOMEM);
-- }
--
--failure:
-- return dentry;
--}
--
--
--static struct dentry *squashfs_fh_to_dentry(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type)
-+static void vfs_read_inode(struct inode *i)
- {
-- if((fh_type != FILEID_INO32_GEN && fh_type != FILEID_INO32_GEN_PARENT) ||
-- fh_len < 2)
-- return NULL;
--
-- return squashfs_export_iget(s, fid->i32.ino);
--}
-+ struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+ squashfs_inode_t inode = squashfs_inode_lookup(i->i_sb, i->i_ino);
-
-+ TRACE("Entered vfs_read_inode\n");
-
--static struct dentry *squashfs_fh_to_parent(struct super_block *s,
-- struct fid *fid, int fh_len, int fh_type)
--{
-- if(fh_type != FILEID_INO32_GEN_PARENT || fh_len < 4)
-- return NULL;
--
-- return squashfs_export_iget(s, fid->i32.parent_ino);
-+ if(inode != SQUASHFS_INVALID_BLK)
-+ (msblk->read_inode)(i, inode);
- }
-
-
- static struct dentry *squashfs_get_parent(struct dentry *child)
- {
- struct inode *i = child->d_inode;
-+ struct inode *parent = iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
-+ struct dentry *rv;
-
- TRACE("Entered squashfs_get_parent\n");
-
-- return squashfs_export_iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
--}
-+ if(parent == NULL) {
-+ rv = ERR_PTR(-EACCES);
-+ goto out;
-+ }
-
-+ rv = d_alloc_anon(parent);
-+ if(rv == NULL)
-+ rv = ERR_PTR(-ENOMEM);
-
-+out:
-+ return rv;
-+}
-+
-+
- SQSH_EXTERN struct inode *squashfs_iget(struct super_block *s,
- squashfs_inode_t inode, unsigned int inode_number)
- {
-@@ -1247,6 +1219,7 @@ static int squashfs_fill_super(struct su
- if (read_inode_lookup_table(s) == 0)
- goto failed_mount;
-
-+ s->s_op = &squashfs_export_super_ops;
- s->s_export_op = &squashfs_export_ops;
-
- allocate_root: