From: Jeff Layton Date: Wed, 19 Sep 2012 13:22:46 +0000 (-0700) Subject: cifs: add FL_CLOSE to fl_flags mask in cifs_read_flock X-Git-Tag: upstream/snapshot3+hdmi~6584^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d6d854a13844223b603fd7a16a4a4a4afd62c72;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git cifs: add FL_CLOSE to fl_flags mask in cifs_read_flock FL_CLOSE is quite common when you close a file on which you hold a lock. The spurious "Unknown lock flags" message in cFYI is confusing in this case. Reported-by: Alexander Bokovoy Signed-off-by: Jeff Layton Reviewed-by: Pavel Shilovsky Signed-off-by: Steve French --- diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 88e9c74..075f7cf 100644 --- a/fs/cifs/file.c +++ b/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;