Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull SMB3 fixes from Steve French: "A collection of CIFS/SMB3 fixes. It includes a couple bug fixes, a few for improved debugging of cifs.ko and some improvements to the way cifs does key generation. I do have some additional bug fixes I expect in the next week or two (to address a problem found by xfstest, and some fixes for SMB3.11 dialect, and a couple patches that just came in yesterday that I am reviewing)" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs_dbg() outputs an uninitialized buffer in cifs_readdir() cifs: fix race between call_async() and reconnect() Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this. cifs: Allow using O_DIRECT with cache=loose cifs: Make echo interval tunable cifs: Check uniqueid for SMB2+ and return -ESTALE if necessary Print IP address of unresponsive server cifs: Ratelimit kernel log messages
Showing
- fs/cifs/cifs_debug.c 1 addition, 1 deletionfs/cifs/cifs_debug.c
- fs/cifs/cifs_debug.h 4 additions, 5 deletionsfs/cifs/cifs_debug.h
- fs/cifs/cifsfs.c 17 additions, 0 deletionsfs/cifs/cifsfs.c
- fs/cifs/cifsglob.h 12 additions, 4 deletionsfs/cifs/cifsglob.h
- fs/cifs/cifsproto.h 3 additions, 2 deletionsfs/cifs/cifsproto.h
- fs/cifs/connect.c 28 additions, 8 deletionsfs/cifs/connect.c
- fs/cifs/inode.c 22 additions, 2 deletionsfs/cifs/inode.c
- fs/cifs/misc.c 1 addition, 1 deletionfs/cifs/misc.c
- fs/cifs/readdir.c 1 addition, 0 deletionsfs/cifs/readdir.c
- fs/cifs/smb2misc.c 30 additions, 6 deletionsfs/cifs/smb2misc.c
- fs/cifs/smb2ops.c 9 additions, 4 deletionsfs/cifs/smb2ops.c
- fs/cifs/smb2pdu.c 4 additions, 6 deletionsfs/cifs/smb2pdu.c
- fs/cifs/smb2pdu.h 4 additions, 4 deletionsfs/cifs/smb2pdu.h
- fs/cifs/smb2proto.h 2 additions, 1 deletionfs/cifs/smb2proto.h
- fs/cifs/smb2transport.c 96 additions, 6 deletionsfs/cifs/smb2transport.c
- fs/cifs/transport.c 4 additions, 2 deletionsfs/cifs/transport.c
Please register or sign in to comment