Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6cef007edb45483caab8ebbda61ce30ad5575851)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6cef007edb45483caab8ebbda61ce30ad5575851)
  • Date: Fri, 12 Oct 2007 08:57:28 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/fuse/HISTORY | 4 +
disk/fuse/PRE_BUILD | 1
disk/fuse/fuse-2.7.0-kernel-2.6.23.patch | 65
+++++++++++++++++++++++++++++++
3 files changed, 70 insertions(+)

New commits:
commit 6cef007edb45483caab8ebbda61ce30ad5575851
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fuse - fix for latest kernel

diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 9d0d430..b448b71 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,7 @@
+2007-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * fuse-2.7.0-kernel-2.6.23.patch: added
+ * PRE_BUILD: apply upstream patch
+
2007-07-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.7.0

diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index 7b43709..ce93dca 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&

cd "$SOURCE_DIRECTORY" &&

+patch -p1 < $SPELL_DIRECTORY/fuse-2.7.0-kernel-2.6.23.patch &&
if [ "$CVS" = "y" ]; then

./makeconf.sh
diff --git a/disk/fuse/fuse-2.7.0-kernel-2.6.23.patch
b/disk/fuse/fuse-2.7.0-kernel-2.6.23.patch
new file mode 100644
index 0000000..202804e
--- /dev/null
+++ b/disk/fuse/fuse-2.7.0-kernel-2.6.23.patch
@@ -0,0 +1,65 @@
+--- fuse-2.7.0/kernel/dev.c 2007-05-03 13:59:50.000000000 +0300
++++ fuse-2.7.0-mm/kernel/dev.c 2007-09-15 23:42:40.000000000 +0300
+@@ -1093,9 +1093,15 @@
+ int __init fuse_dev_init(void)
+ {
+ int err = -ENOMEM;
++#ifdef KERNEL_2_6_23_PLUS
+ fuse_req_cachep = kmem_cache_create("fuse_request",
+ sizeof(struct fuse_req),
+- 0, 0, NULL, NULL);
++ 0, 0, NULL);
++#else
++ fuse_req_cachep = kmem_cache_create("fuse_request",
++ sizeof(struct fuse_req),
++ 0, 0, NULL, NULL);
++#endif
+ if (!fuse_req_cachep)
+ goto out;
+
+--- fuse-2.7.0/kernel/file.c 2007-07-02 14:32:15.000000000 +0300
++++ fuse-2.7.0-mm/kernel/file.c 2007-09-15 23:39:52.000000000 +0300
+@@ -865,7 +865,9 @@
+ .release = fuse_release,
+ .fsync = fuse_fsync,
+ .lock = fuse_file_lock,
++#ifndef KERNEL_2_6_23_PLUS
+ .sendfile = generic_file_sendfile,
++#endif
+ };
+
+ static struct file_operations fuse_direct_io_file_operations = {
+--- fuse-2.7.0/kernel/fuse_i.h 2007-07-02 14:32:15.000000000 +0300
++++ fuse-2.7.0-mm/kernel/fuse_i.h 2007-09-15 23:39:01.000000000 +0300
+@@ -45,6 +45,10 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ # define KERNEL_2_6_22_PLUS
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++# define KERNEL_2_6_23_PLUS
++#endif
++
+
+ #if defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ #define DCACHE_BUG
+--- fuse-2.7.0/kernel/inode.c 2007-07-02 14:32:15.000000000 +0300
++++ fuse-2.7.0-mm/kernel/inode.c 2007-09-15 23:42:24.000000000 +0300
+@@ -861,10 +861,17 @@
+ if (err)
+ goto out_unreg;
+
++#ifdef KERNEL_2_6_23_PLUS
+ fuse_inode_cachep = kmem_cache_create("fuse_inode",
+ sizeof(struct fuse_inode),
+ 0, SLAB_HWCACHE_ALIGN,
+- fuse_inode_init_once, NULL);
++ fuse_inode_init_once);
++#else
++ fuse_inode_cachep = kmem_cache_create("fuse_inode",
++ sizeof(struct fuse_inode),
++ 0, SLAB_HWCACHE_ALIGN,
++ fuse_inode_init_once, NULL);
++#endif
+ err = -ENOMEM;
+ if (!fuse_inode_cachep)
+ goto out_unreg2;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6cef007edb45483caab8ebbda61ce30ad5575851), Treeve Jelbert, 10/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page