From 04631f7714d67e93ef726d81000d357805a63277 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 12 Sep 2011 09:31:49 +0200
Subject: [PATCH] --- yaml --- r: 263728 b: refs/heads/master c:
 24114504c4d585ec4aae7a2b2acb81bf741f8c8a h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/fuse/inode.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b74d649ca454..9e97e014f93e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87adf1c66cacbc4acd0e696c896755a5091a9d3d
+refs/heads/master: 24114504c4d585ec4aae7a2b2acb81bf741f8c8a
diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c
index 12b502929da9..add96f6ffda5 100644
--- a/trunk/fs/fuse/inode.c
+++ b/trunk/fs/fuse/inode.c
@@ -812,6 +812,9 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
 			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;