---

yaml --- r: 326316 b: refs/heads/master c: 3d6d854 h: refs/heads/master v: v3
git-mirror · Sep 25, 2012 · 66d8363 · 66d8363
1 parent fcf7dbf
commit 66d8363
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecdb69e2cc80cca77d6afcc0aca244b72cc5ee68
+refs/heads/master: 3d6d854a13844223b603fd7a16a4a4a4afd62c72
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
@@ -1173,7 +1173,8 @@ cifs_read_flock(struct file_lock *flock, __u32 *type, int *lock, int *unlock,
 	if (flock->fl_flags & FL_LEASE)
 		cFYI(1, "Lease on file - not implemented yet");
 	if (flock->fl_flags &
-	    (~(FL_POSIX | FL_FLOCK | FL_SLEEP | FL_ACCESS | FL_LEASE)))
+	    (~(FL_POSIX | FL_FLOCK | FL_SLEEP |
+	       FL_ACCESS | FL_LEASE | FL_CLOSE)))
 		cFYI(1, "Unknown lock flags 0x%x", flock->fl_flags);
 
 	*type = server->vals->large_lock_type;