[s3c24xx] jbt6k74: Change the state machine to have one state field for

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 210-mini_fo_2.6.25_fixes.patch

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 bb83133..d71e3b6 100644 (file)
--- 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,5 @@
-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
+--- a/fs/mini_fo/main.c
++++ b/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 +48,8 @@ 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
+--- a/fs/mini_fo/mini_fo.h
++++ b/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 +91,8 @@ 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
+--- a/fs/mini_fo/super.c
++++ b/fs/mini_fo/super.c
 @@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
  }
  #endif
@@ -131,10 +125,8 @@ 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
+--- a/fs/mini_fo/aux.c
++++ b/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);