qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-05 13:16:14 +02:00
Code

fix mini_fo compile -- still oopses on boot

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10889 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2008-04-20 18:10:50 +00:00
parent 3f8ac58c32
commit 933d1136b2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
View File

@ -195,11 +195,11 @@ Index: linux-2.6.23/fs/mini_fo/aux.c
+ err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd); + err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
+ +
+ /* validate */ + /* validate */
+ if (err || !nd.dentry || !nd.dentry->d_inode) { + if (err || !nd.path.dentry || !nd.path.dentry->d_inode) {
+ printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n"); + printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
+ return NULL; + return NULL;
+ } + }
+ return nd.dentry; + return nd.path.dentry;
+} +}
+ +
+ +
@ -3774,7 +3774,7 @@ Index: linux-2.6.23/fs/mini_fo/main.c
+ /* + /*
+ * original: inode = iget(sb, hidden_inode->i_ino); + * original: inode = iget(sb, hidden_inode->i_ino);
+ */ + */
+ inode = iget(sb, iunique(sb, 25)); + inode = iget_locked(sb, iunique(sb, 25));
+ if (!inode) { + if (!inode) {
+ err = -EACCES; /* should be impossible??? */ + err = -EACCES; /* should be impossible??? */
+ goto out; + goto out;
@ -3876,9 +3876,9 @@ Index: linux-2.6.23/fs/mini_fo/main.c
+ hidden_root = ERR_PTR(err); + hidden_root = ERR_PTR(err);
+ goto out; + goto out;
+ } + }
+ hidden_root = nd.dentry; + hidden_root = nd.path.dentry;
+ stopd(sb)->base_dir_dentry = nd.dentry; + stopd(sb)->base_dir_dentry = nd.path.dentry;
+ stopd(sb)->hidden_mnt = nd.mnt; + stopd(sb)->hidden_mnt = nd.path.mnt;
+ +
+ } else if(!strncmp("sto=", options, 4)) { + } else if(!strncmp("sto=", options, 4)) {
+ /* parse the storage dir */ + /* parse the storage dir */
@ -3896,9 +3896,9 @@ Index: linux-2.6.23/fs/mini_fo/main.c
+ hidden_root2 = ERR_PTR(err); + hidden_root2 = ERR_PTR(err);
+ goto out; + goto out;
+ } + }
+ hidden_root2 = nd2.dentry; + hidden_root2 = nd2.path.dentry;
+ stopd(sb)->storage_dir_dentry = nd2.dentry; + stopd(sb)->storage_dir_dentry = nd2.path.dentry;
+ stopd(sb)->hidden_mnt2 = nd2.mnt; + stopd(sb)->hidden_mnt2 = nd2.path.mnt;
+ stohs2(sb) = hidden_root2->d_sb; + stohs2(sb) = hidden_root2->d_sb;
+ +
+ /* validate storage dir, this is done in + /* validate storage dir, this is done in
@ -7561,7 +7561,7 @@ Index: linux-2.6.23/fs/mini_fo/super.c
+#include "fist.h" +#include "fist.h"
+#include "mini_fo.h" +#include "mini_fo.h"
+ +
+ +#if 0
+STATIC void +STATIC void
+mini_fo_read_inode(inode_t *inode) +mini_fo_read_inode(inode_t *inode)
+{ +{
@ -7600,7 +7600,7 @@ Index: linux-2.6.23/fs/mini_fo/super.c
+ /* I don't think ->a_ops is ever allowed to be NULL */ + /* I don't think ->a_ops is ever allowed to be NULL */
+ inode->i_mapping->a_ops = &mini_fo_empty_aops; + inode->i_mapping->a_ops = &mini_fo_empty_aops;
+} +}
+ +#endif
+ +
+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) +#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+/* +/*
@ -7798,7 +7798,7 @@ Index: linux-2.6.23/fs/mini_fo/super.c
+ +
+struct super_operations mini_fo_sops = +struct super_operations mini_fo_sops =
+{ +{
+ read_inode: mini_fo_read_inode, +// read_inode: mini_fo_read_inode,
+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) +#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+ write_inode: mini_fo_write_inode, + write_inode: mini_fo_write_inode,
+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */ +#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */