---

yaml --- r: 263728 b: refs/heads/master c: 2411450 h: refs/heads/master v: v3
git-mirror · Sep 12, 2011 · 04631f7 · 04631f7
1 parent 691f239
commit 04631f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;