diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-15 21:18:34 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-01-15 21:18:34 +0000 |
commit | 50050af93cfeca75eed403b6d85e61fe0a85a91e (patch) | |
tree | be16db4b392698dba45f49fc754a8c638cf414ff /target/linux/brcm47xx/patches-3.2/302-kmod-fuse-dcache-bug-fuse.patch | |
parent | f1429085fb521c455ee36dcde923f3769e229a31 (diff) | |
download | upstream-50050af93cfeca75eed403b6d85e61fe0a85a91e.tar.gz upstream-50050af93cfeca75eed403b6d85e61fe0a85a91e.tar.bz2 upstream-50050af93cfeca75eed403b6d85e61fe0a85a91e.zip |
brcm47xx: add support for kernel 3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29756 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/302-kmod-fuse-dcache-bug-fuse.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.2/302-kmod-fuse-dcache-bug-fuse.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/302-kmod-fuse-dcache-bug-fuse.patch b/target/linux/brcm47xx/patches-3.2/302-kmod-fuse-dcache-bug-fuse.patch new file mode 100644 index 0000000000..6465e74768 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.2/302-kmod-fuse-dcache-bug-fuse.patch @@ -0,0 +1,46 @@ +--- a/fs/fuse/dev.c ++++ b/fs/fuse/dev.c +@@ -651,11 +651,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 +@@ -1211,6 +1211,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) |