summaryrefslogtreecommitdiffstats
path: root/package/fuse/patches/220-kmem_cache.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-23 15:54:36 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-23 15:54:36 +0000
commitb947ccab5d1acdf82b56fc6ab64a2dba71c2e50a (patch)
tree2e7e373029544716222b507e7a03ededb7fe72e5 /package/fuse/patches/220-kmem_cache.patch
parentcad52677420d82279b3b97d5268bda415c90dd54 (diff)
Upgrade fuse to 2.6.5 (#1955)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7716 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/fuse/patches/220-kmem_cache.patch')
-rw-r--r--package/fuse/patches/220-kmem_cache.patch14
1 files changed, 9 insertions, 5 deletions
diff --git a/package/fuse/patches/220-kmem_cache.patch b/package/fuse/patches/220-kmem_cache.patch
index 7fb439656..79960b74f 100644
--- a/package/fuse/patches/220-kmem_cache.patch
+++ b/package/fuse/patches/220-kmem_cache.patch
@@ -1,5 +1,7 @@
---- fuse.old/kernel/dev.c 2007-01-28 21:26:41.000000000 +0000
-+++ fuse.dev/kernel/dev.c 2007-05-29 00:28:47.000000000 +0100
+Index: fuse-2.6.5/kernel/dev.c
+===================================================================
+--- fuse-2.6.5.orig/kernel/dev.c 2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/kernel/dev.c 2007-06-23 13:03:51.000000000 +0200
@@ -21,7 +21,11 @@
MODULE_ALIAS_MISCDEV(FUSE_MINOR);
#endif
@@ -12,7 +14,7 @@
static struct fuse_conn *fuse_get_conn(struct file *file)
{
-@@ -1093,9 +1093,13 @@
+@@ -1093,9 +1097,13 @@
int __init fuse_dev_init(void)
{
int err = -ENOMEM;
@@ -26,8 +28,10 @@
if (!fuse_req_cachep)
goto out;
---- fuse.old/kernel/inode.c 2007-02-04 13:34:51.000000000 +0000
-+++ fuse.dev/kernel/inode.c 2007-05-29 00:26:12.000000000 +0100
+Index: fuse-2.6.5/kernel/inode.c
+===================================================================
+--- fuse-2.6.5.orig/kernel/inode.c 2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/kernel/inode.c 2007-06-23 13:03:51.000000000 +0200
@@ -24,7 +24,7 @@
MODULE_LICENSE("GPL");
#endif