CIFS: Separate pushing mandatory locks and lock_sem handling
authorPavel Shilovsky <piastry@etersoft.ru>
Thu, 22 Nov 2012 13:07:16 +0000 (17:07 +0400)
committerSteve French <smfrench@gmail.com>
Wed, 5 Dec 2012 19:27:29 +0000 (13:27 -0600)
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <smfrench@gmail.com>
fs/cifs/file.c
fs/cifs/smb2file.c

diff --cc fs/cifs/file.c
Simple merge
Simple merge