CIFS: Move brlock code to ops struct
authorPavel Shilovsky <pshilovsky@samba.org>
Wed, 19 Sep 2012 13:22:43 +0000 (06:22 -0700)
committerSteve French <smfrench@gmail.com>
Tue, 25 Sep 2012 02:46:32 +0000 (21:46 -0500)
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
fs/cifs/cifsglob.h
fs/cifs/cifsproto.h
fs/cifs/file.c
fs/cifs/smb1ops.c

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