Commit 3d6d854a authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

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: default avatarAlexander Bokovoy <abokovoy@redhat.com>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent ecdb69e2

fs/cifs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -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;