diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-02-20 19:31:13 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-02-20 19:31:13 +0000 |
| commit | fde6b95e15552bbe3e387d1b66bc11a762efffa4 (patch) | |
| tree | 0ec39aad865da4f5bfe5ea404199055adde552d1 /target/linux/brcm47xx/patches-2.6.32/302-kmod-fuse-dcache-bug-fuse.patch | |
| parent | 92b5bec118673c40e9abbf5f9620fb3609735fb7 (diff) | |
| download | upstream-fde6b95e15552bbe3e387d1b66bc11a762efffa4.tar.gz upstream-fde6b95e15552bbe3e387d1b66bc11a762efffa4.tar.bz2 upstream-fde6b95e15552bbe3e387d1b66bc11a762efffa4.zip | |
[brcm47xx] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19781 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.32/302-kmod-fuse-dcache-bug-fuse.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.32/302-kmod-fuse-dcache-bug-fuse.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.32/302-kmod-fuse-dcache-bug-fuse.patch b/target/linux/brcm47xx/patches-2.6.32/302-kmod-fuse-dcache-bug-fuse.patch index 79515d4449..d6c0b3ab55 100644 --- a/target/linux/brcm47xx/patches-2.6.32/302-kmod-fuse-dcache-bug-fuse.patch +++ b/target/linux/brcm47xx/patches-2.6.32/302-kmod-fuse-dcache-bug-fuse.patch @@ -1,6 +1,6 @@ --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c -@@ -527,6 +527,11 @@ static void fuse_copy_finish(struct fuse +@@ -533,6 +533,11 @@ static void fuse_copy_finish(struct fuse } } @@ -12,7 +12,7 @@ /* * Get another pagefull of userspace buffer, and map it to kernel * address space, and lock request -@@ -535,6 +540,9 @@ static int fuse_copy_fill(struct fuse_co +@@ -541,6 +546,9 @@ static int fuse_copy_fill(struct fuse_co { unsigned long offset; int err; @@ -22,7 +22,7 @@ unlock_request(cs->fc, cs->req); fuse_copy_finish(cs); -@@ -546,14 +554,22 @@ static int fuse_copy_fill(struct fuse_co +@@ -552,14 +560,22 @@ static int fuse_copy_fill(struct fuse_co cs->nr_segs--; } down_read(¤t->mm->mmap_sem); @@ -45,7 +45,7 @@ cs->buf = cs->mapaddr + offset; cs->len = min(PAGE_SIZE - offset, cs->seglen); cs->seglen -= cs->len; -@@ -567,6 +583,11 @@ static int fuse_copy_do(struct fuse_copy +@@ -573,6 +589,11 @@ static int fuse_copy_do(struct fuse_copy { unsigned ncpy = min(*size, cs->len); if (val) { @@ -69,7 +69,7 @@ #include <linux/fs.h> --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c -@@ -1055,6 +1055,10 @@ static int __init fuse_init(void) +@@ -1201,6 +1201,10 @@ static int __init fuse_init(void) printk(KERN_INFO "fuse init (API version %i.%i)\n", FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); |