brcm47xx: add workaround for fuse again.

This closes #4754


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26141 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 94 insertions, 10 deletions

diff --git a/target/linux/brcm47xx/patches-2.6.36/301-kmod-fuse-dcache-bug-r4k.patch b/target/linux/brcm47xx/patches-2.6.36/301-kmod-fuse-dcache-bug-r4k.patch
index 62f699298..70b379c61 100644
--- a/target/linux/brcm47xx/patches-2.6.36/301-kmod-fuse-dcache-bug-r4k.patch
+++ b/target/linux/brcm47xx/patches-2.6.36/301-kmod-fuse-dcache-bug-r4k.patch
@@ -18,7 +18,7 @@
  	unsigned long addr, unsigned long pfn)
  {
  	struct flush_cache_page_args args;
-@@ -1469,3 +1469,11 @@ void __cpuinit r4k_cache_init(void)
+@@ -1469,3 +1469,7 @@ void __cpuinit r4k_cache_init(void)
  	coherency_setup();
  #endif
  }
@@ -26,7 +26,3 @@
 +/* fuse package DCACHE BUG patch exports */
 +void (*fuse_flush_cache_all)(void) = r4k___flush_cache_all;
 +EXPORT_SYMBOL(fuse_flush_cache_all);
-+
-+void (*fuse_flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
-+	unsigned long pfn) = r4k_flush_cache_page;
-+EXPORT_SYMBOL(fuse_flush_cache_page);
diff --git a/target/linux/brcm47xx/patches-2.6.36/302-kmod-fuse-dcache-bug-fuse.patch b/target/linux/brcm47xx/patches-2.6.36/302-kmod-fuse-dcache-bug-fuse.patch
new file mode 100644
index 000000000..a546b1bc2
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.36/302-kmod-fuse-dcache-bug-fuse.patch
@@ -0,0 +1,46 @@
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -639,11 +639,20 @@ static int fuse_copy_fill(struct fuse_co
+ 	return lock_request(cs->fc, cs->req);
+ }
+ 
++#ifdef DCACHE_BUG
++extern void (*fuse_flush_cache_all)(void);
++#endif
++
+ /* Do as much copy to/from userspace buffer as we can */
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
+ 	if (val) {
++#ifdef DCACHE_BUG
++		// patch from mailing list, it is very important, otherwise,
++		// can't mount, or ls mount point will hang
++		fuse_flush_cache_all();
++#endif
+ 		if (cs->write)
+ 			memcpy(cs->buf, *val, ncpy);
+ 		else
+--- a/fs/fuse/fuse_i.h
++++ b/fs/fuse/fuse_i.h
+@@ -8,6 +8,7 @@
+ 
+ #ifndef _FS_FUSE_I_H
+ #define _FS_FUSE_I_H
++#define DCACHE_BUG
+ 
+ #include <linux/fuse.h>
+ #include <linux/fs.h>
+--- a/fs/fuse/inode.c
++++ b/fs/fuse/inode.c
+@@ -1203,6 +1203,10 @@ static int __init fuse_init(void)
+ 	printk(KERN_INFO "fuse init (API version %i.%i)\n",
+ 	       FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
+ 
++#ifdef DCACHE_BUG
++	printk("fuse init DCACHE_BUG workaround enabled\n");
++#endif
++
+ 	INIT_LIST_HEAD(&fuse_conn_list);
+ 	res = fuse_fs_init();
+ 	if (res)
diff --git a/target/linux/brcm47xx/patches-2.6.37/301-kmod-fuse-dcache-bug-r4k.patch b/target/linux/brcm47xx/patches-2.6.37/301-kmod-fuse-dcache-bug-r4k.patch
index d16460ca3..919a2091c 100644
--- a/target/linux/brcm47xx/patches-2.6.37/301-kmod-fuse-dcache-bug-r4k.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/301-kmod-fuse-dcache-bug-r4k.patch
@@ -18,7 +18,7 @@
  	unsigned long addr, unsigned long pfn)
  {
  	struct flush_cache_page_args args;
-@@ -1468,3 +1468,11 @@ void __cpuinit r4k_cache_init(void)
+@@ -1468,3 +1468,7 @@ void __cpuinit r4k_cache_init(void)
  	coherency_setup();
  #endif
  }
@@ -26,7 +26,3 @@
 +/* fuse package DCACHE BUG patch exports */
 +void (*fuse_flush_cache_all)(void) = r4k___flush_cache_all;
 +EXPORT_SYMBOL(fuse_flush_cache_all);
-+
-+void (*fuse_flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
-+	unsigned long pfn) = r4k_flush_cache_page;
-+EXPORT_SYMBOL(fuse_flush_cache_page);
diff --git a/target/linux/brcm47xx/patches-2.6.37/302-kmod-fuse-dcache-bug-fuse.patch b/target/linux/brcm47xx/patches-2.6.37/302-kmod-fuse-dcache-bug-fuse.patch
new file mode 100644
index 000000000..5c3839f2b
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.37/302-kmod-fuse-dcache-bug-fuse.patch
@@ -0,0 +1,46 @@
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -639,11 +639,20 @@ static int fuse_copy_fill(struct fuse_co
+ 	return lock_request(cs->fc, cs->req);
+ }
+ 
++#ifdef DCACHE_BUG
++extern void (*fuse_flush_cache_all)(void);
++#endif
++
+ /* Do as much copy to/from userspace buffer as we can */
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
+ 	if (val) {
++#ifdef DCACHE_BUG
++		// patch from mailing list, it is very important, otherwise,
++		// can't mount, or ls mount point will hang
++		fuse_flush_cache_all();
++#endif
+ 		if (cs->write)
+ 			memcpy(cs->buf, *val, ncpy);
+ 		else
+--- a/fs/fuse/fuse_i.h
++++ b/fs/fuse/fuse_i.h
+@@ -8,6 +8,7 @@
+ 
+ #ifndef _FS_FUSE_I_H
+ #define _FS_FUSE_I_H
++#define DCACHE_BUG
+ 
+ #include <linux/fuse.h>
+ #include <linux/fs.h>
+--- a/fs/fuse/inode.c
++++ b/fs/fuse/inode.c
+@@ -1202,6 +1202,10 @@ static int __init fuse_init(void)
+ 	printk(KERN_INFO "fuse init (API version %i.%i)\n",
+ 	       FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
+ 
++#ifdef DCACHE_BUG
++	printk("fuse init DCACHE_BUG workaround enabled\n");
++#endif
++
+ 	INIT_LIST_HEAD(&fuse_conn_list);
+ 	res = fuse_fs_init();
+ 	if (res)