Bugzilla Bug 119532

2.6.16 changed some api..as usual :)

fix is from Miklos  Szeredi (fuse mainteiner) and will be merged in 2.5.1

Index: kernel/file.c
===================================================================
RCS file: /cvsroot/fuse/fuse/kernel/file.c,v
retrieving revision 1.94
retrieving revision 1.94.2.1
diff -u -r1.94 -r1.94.2.1
--- kernel/file.c       6 Jan 2006 18:29:39 -0000       1.94
+++ kernel/file.c       18 Jan 2006 12:17:33 -0000      1.94.2.1
@@ -675,9 +675,15 @@
        struct inode *inode = file->f_dentry->d_inode;
        ssize_t res;
        /* Don't allow parallel writes to the same file */
+#ifdef KERNEL_2_6_16_PLUS
+       mutex_lock(&inode->i_mutex);
+       res = fuse_direct_io(file, buf, count, ppos, 1);
+       mutex_unlock(&inode->i_mutex);
+#else
        down(&inode->i_sem);
        res = fuse_direct_io(file, buf, count, ppos, 1);
        up(&inode->i_sem);
+#endif
        return res;
 }

Index: kernel/fuse_i.h
===================================================================
RCS file: /cvsroot/fuse/fuse/kernel/fuse_i.h,v
retrieving revision 1.99
retrieving revision 1.99.2.1
diff -u -r1.99 -r1.99.2.1
--- kernel/fuse_i.h     14 Jan 2006 14:47:21 -0000      1.99
+++ kernel/fuse_i.h     18 Jan 2006 12:17:33 -0000      1.99.2.1
@@ -40,6 +40,9 @@
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
 #    define KERNEL_2_6_13_PLUS
 #  endif
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#    define KERNEL_2_6_16_PLUS
+#  endif
 #endif

 #include "config.h"


please apply asap

*** Bug 119533 has been marked as a duplicate of this bug. ***

*** Bug 119534 has been marked as a duplicate of this bug. ***

i'm sorry for bugzilla spam, server had some problems and it always timed out.

*** Bug 119617 has been marked as a duplicate of this bug. ***

can you please attach a real patch file that works?
first hunk fails for me:


PATCH COMMAND:  patch -p0 -g0 --no-backup-if-mismatch <
/usr/portage/sys-fs/fuse/files/fuse-2.6.16.patch

=============================
patching file kernel/file.c
Hunk #1 FAILED at 675.
1 out of 1 hunk FAILED -- saving rejects to file kernel/file.c.rej
patching file kernel/fuse_i.h
=============================

That's the cvs commit Miklos sent to me.
have u stripped cvs formatting things?
if so, it should depends on white spaces/tabs.

i did manual patching, so didn't use patch tool.

*** Bug 119676 has been marked as a duplicate of this bug. ***

got it working, thanks.

Please attach patches next time to avoid such issues :)

*** Bug 131036 has been marked as a duplicate of this bug. ***