aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch40
1 files changed, 16 insertions, 24 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
index bb83133b34..22ca3900e9 100644
--- a/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/fs/mini_fo/main.c
-===================================================================
---- linux-2.6.25.4.orig/fs/mini_fo/main.c
-+++ linux-2.6.25.4/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
+--- a/fs/mini_fo/main.c
++++ b/fs/mini_fo/main.c
+@@ -79,6 +79,7 @@
* of the new inode's fields
*/
@@ -10,7 +8,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
/*
* original: inode = iget(sb, hidden_inode->i_ino);
*/
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
+@@ -87,6 +88,13 @@
err = -EACCES; /* should be impossible??? */
goto out;
}
@@ -24,7 +22,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
/*
* interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
+@@ -184,9 +192,9 @@
hidden_root = ERR_PTR(err);
goto out;
}
@@ -37,7 +35,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
} else if(!strncmp("sto=", options, 4)) {
/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
+@@ -204,9 +212,9 @@
hidden_root2 = ERR_PTR(err);
goto out;
}
@@ -50,11 +48,9 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c
stohs2(sb) = hidden_root2->d_sb;
/* validate storage dir, this is done in
-Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
-===================================================================
---- linux-2.6.25.4.orig/fs/mini_fo/mini_fo.h
-+++ linux-2.6.25.4/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
+--- a/fs/mini_fo/mini_fo.h
++++ b/fs/mini_fo/mini_fo.h
+@@ -302,6 +302,10 @@
extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
dentry_t *src_dentry, struct vfsmount *src_mnt);
@@ -65,7 +61,7 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
+@@ -501,6 +505,29 @@
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
#endif /* __KERNEL__ */
@@ -95,11 +91,9 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
/*
* Definitions for user and kernel code
*/
-Index: linux-2.6.25.4/fs/mini_fo/super.c
-===================================================================
---- linux-2.6.25.4.orig/fs/mini_fo/super.c
-+++ linux-2.6.25.4/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
+--- a/fs/mini_fo/super.c
++++ b/fs/mini_fo/super.c
+@@ -262,10 +262,31 @@
}
#endif
@@ -131,11 +125,9 @@ Index: linux-2.6.25.4/fs/mini_fo/super.c
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
write_inode: mini_fo_write_inode,
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-Index: linux-2.6.25.4/fs/mini_fo/aux.c
-===================================================================
---- linux-2.6.25.4.orig/fs/mini_fo/aux.c
-+++ linux-2.6.25.4/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+--- a/fs/mini_fo/aux.c
++++ b/fs/mini_fo/aux.c
+@@ -164,11 +164,11 @@
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
/* validate */