aboutsummaryrefslogtreecommitdiffstats
path: root/package/fuse/patches-kernel24/113-DCACHE_BUG.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/fuse/patches-kernel24/113-DCACHE_BUG.patch')
-rw-r--r--package/fuse/patches-kernel24/113-DCACHE_BUG.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/package/fuse/patches-kernel24/113-DCACHE_BUG.patch b/package/fuse/patches-kernel24/113-DCACHE_BUG.patch
deleted file mode 100644
index da0d27cd2f..0000000000
--- a/package/fuse/patches-kernel24/113-DCACHE_BUG.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/kernel/dev.c
-+++ b/kernel/dev.c
-@@ -512,6 +512,9 @@ static int fuse_copy_fill(struct fuse_co
- {
- unsigned long offset;
- int err;
-+#ifdef DCACHE_BUG
-+ struct vm_area_struct *vma;
-+#endif
-
- unlock_request(cs->req);
- fuse_copy_finish(cs);
-@@ -523,14 +526,22 @@ static int fuse_copy_fill(struct fuse_co
- cs->nr_segs --;
- }
- down_read(&current->mm->mmap_sem);
-+#ifndef DCACHE_BUG
- err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0,
- &cs->pg, NULL);
-+#else
-+ err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0,
-+ &cs->pg, &vma);
-+#endif
- up_read(&current->mm->mmap_sem);
- if (err < 0)
- return err;
- BUG_ON(err != 1);
- offset = cs->addr % PAGE_SIZE;
- cs->mapaddr = kmap_atomic(cs->pg, KM_USER0);
-+#ifdef DCACHE_BUG
-+ r4k_flush_cache_page(vma, cs->addr);
-+#endif
- cs->buf = cs->mapaddr + offset;
- cs->len = min(PAGE_SIZE - offset, cs->seglen);
- cs->seglen -= cs->len;
-@@ -545,6 +556,11 @@ static inline int fuse_copy_do(struct fu
- {
- 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
-+ flush_cache_all();
-+#endif
- if (cs->write)
- memcpy(cs->buf, *val, ncpy);
- else
---- a/kernel/fuse_i.h
-+++ b/kernel/fuse_i.h
-@@ -45,6 +45,10 @@
- # endif
- #endif
-
-+//#if defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-+#define DCACHE_BUG
-+//#endif
-+
- #include "config.h"
- #ifndef KERNEL_2_6
- # include <linux/config.h>
---- a/kernel/inode.c
-+++ b/kernel/inode.c
-@@ -739,6 +739,10 @@ static int __init fuse_init(void)
- printk("fuse distribution version: %s\n", FUSE_VERSION);
- #endif
-
-+#ifdef DCACHE_BUG
-+printk("fuse init: DCACHE_BUG enabled\n");
-+#endif
-+
- spin_lock_init(&fuse_lock);
- res = fuse_fs_init();
- if (res)