[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <8739g2z062.fsf@tucsk.pomaz.szeredi.hu>
Date: Mon, 12 Sep 2011 09:31:49 +0200
From: Miklos Szeredi <miklos@...redi.hu>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 1/2] fuse: fix flock breakage
From: Miklos Szeredi <mszeredi@...e.cz>
Commit 37fb3a30b4 "fuse: fix flock" added in 3.1-rc4 caused flock() to
fail with ENOSYS with the kernel ABI version 7.16 or earlier.
Fix by falling back to testing FUSE_POSIX_LOCKS for ABI versions 7.16
and earlier.
Reported-by: Martin Ziegler <ziegler@...il.mathematik.uni-freiburg.de>
Signed-off-by: Miklos Szeredi <mszeredi@...e.cz>
Tested-by: Martin Ziegler <ziegler@...il.mathematik.uni-freiburg.de>
---
fs/fuse/inode.c | 3 +++
1 file changed, 3 insertions(+)
Index: linux-2.6/fs/fuse/inode.c
===================================================================
--- linux-2.6.orig/fs/fuse/inode.c 2011-09-07 11:40:36.000000000 +0200
+++ linux-2.6/fs/fuse/inode.c 2011-09-09 12:02:29.000000000 +0200
@@ -812,6 +812,9 @@ static void process_init_reply(struct fu
if (arg->minor >= 17) {
if (!(arg->flags & FUSE_FLOCK_LOCKS))
fc->no_flock = 1;
+ } else {
+ if (!(arg->flags & FUSE_POSIX_LOCKS))
+ fc->no_flock = 1;
}
if (arg->flags & FUSE_ATOMIC_O_TRUNC)
fc->atomic_o_trunc = 1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists