From 66d83631e5981607841df1c456acf3e98df52966 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 19 Sep 2012 06:22:46 -0700
Subject: [PATCH] --- yaml --- r: 326316 b: refs/heads/master c:
 3d6d854a13844223b603fd7a16a4a4a4afd62c72 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/cifs/file.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ce646a0baace..8303a0ed93a8 100644
--- 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
index 88e9c74e2cac..075f7cfd1da5 100644
--- 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;