diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-18 15:24:44 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-06-18 15:24:44 +0000 |
commit | cbd8113c9faa614b939de66f476426d46c34f8d0 (patch) | |
tree | db336d3a35705b7d66b95300b7131e97c4b93a5b /target/linux/brcm47xx/patches-3.0/302-kmod-fuse-dcache-bug-fuse.patch | |
parent | 82322c1e1c0b3276cef27cec2db47e4f1212b2c3 (diff) | |
download | upstream-cbd8113c9faa614b939de66f476426d46c34f8d0.tar.gz upstream-cbd8113c9faa614b939de66f476426d46c34f8d0.tar.bz2 upstream-cbd8113c9faa614b939de66f476426d46c34f8d0.zip |
brcm47xx: add support for kernel 3.0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27217 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/302-kmod-fuse-dcache-bug-fuse.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.0/302-kmod-fuse-dcache-bug-fuse.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/302-kmod-fuse-dcache-bug-fuse.patch b/target/linux/brcm47xx/patches-3.0/302-kmod-fuse-dcache-bug-fuse.patch new file mode 100644 index 0000000000..6756a0bf64 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.0/302-kmod-fuse-dcache-bug-fuse.patch @@ -0,0 +1,46 @@ +--- a/fs/fuse/dev.c ++++ b/fs/fuse/dev.c +@@ -647,11 +647,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) |