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:
authorGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
commit1d4db4520ab1c4e7472a48d14ec641e2ef074b6b (patch)
treeb992b5d551457de6a5d6f53b37b9eec182c68c29 /target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
parent5c09219b13a1f3695729cc24ac7e8390859a406f (diff)
downloadmaster-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.gz
master-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.tar.bz2
master-187ad058-1d4db4520ab1c4e7472a48d14ec641e2ef074b6b.zip
[kernel] update to 2.6.25.1 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch24
1 files changed, 12 insertions, 12 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 77c2ff3e80..337d4de9e3 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,7 +1,7 @@
-Index: linux-2.6.25/fs/mini_fo/main.c
+Index: linux-2.6.25.1/fs/mini_fo/main.c
===================================================================
---- linux-2.6.25.orig/fs/mini_fo/main.c
-+++ linux-2.6.25/fs/mini_fo/main.c
+--- linux-2.6.25.1.orig/fs/mini_fo/main.c
++++ linux-2.6.25.1/fs/mini_fo/main.c
@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
* of the new inode's fields
*/
@@ -50,10 +50,10 @@ Index: linux-2.6.25/fs/mini_fo/main.c
stohs2(sb) = hidden_root2->d_sb;
/* validate storage dir, this is done in
-Index: linux-2.6.25/fs/mini_fo/mini_fo.h
+Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
===================================================================
---- linux-2.6.25.orig/fs/mini_fo/mini_fo.h
-+++ linux-2.6.25/fs/mini_fo/mini_fo.h
+--- linux-2.6.25.1.orig/fs/mini_fo/mini_fo.h
++++ linux-2.6.25.1/fs/mini_fo/mini_fo.h
@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
dentry_t *src_dentry, struct vfsmount *src_mnt);
@@ -95,10 +95,10 @@ Index: linux-2.6.25/fs/mini_fo/mini_fo.h
/*
* Definitions for user and kernel code
*/
-Index: linux-2.6.25/fs/mini_fo/super.c
+Index: linux-2.6.25.1/fs/mini_fo/super.c
===================================================================
---- linux-2.6.25.orig/fs/mini_fo/super.c
-+++ linux-2.6.25/fs/mini_fo/super.c
+--- linux-2.6.25.1.orig/fs/mini_fo/super.c
++++ linux-2.6.25.1/fs/mini_fo/super.c
@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
}
#endif
@@ -131,10 +131,10 @@ Index: linux-2.6.25/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/fs/mini_fo/aux.c
+Index: linux-2.6.25.1/fs/mini_fo/aux.c
===================================================================
---- linux-2.6.25.orig/fs/mini_fo/aux.c
-+++ linux-2.6.25/fs/mini_fo/aux.c
+--- linux-2.6.25.1.orig/fs/mini_fo/aux.c
++++ linux-2.6.25.1/fs/mini_fo/aux.c
@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);