Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
* '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6: (52 commits) Fix build break when freezer not configured Add definition for share encryption CIFS: Make cifs_push_locks send as many locks at once as possible CIFS: Send as many mandatory unlock ranges at once as possible CIFS: Implement caching mechanism for posix brlocks CIFS: Implement caching mechanism for mandatory brlocks CIFS: Fix DFS handling in cifs_get_file_info CIFS: Fix error handling in cifs_readv_complete [CIFS] Fixup trivial checkpatch warning [CIFS] Show nostrictsync and noperm mount options in /proc/mounts cifs, freezer: add wait_event_freezekillable and have cifs use it cifs: allow cifs_max_pending to be readable under /sys/module/cifs/parameters cifs: tune bdi.ra_pages in accordance with the rsize cifs: allow for larger rsize= options and change defaults cifs: convert cifs_readpages to use async reads cifs: add cifs_async_readv cifs: fix protocol definition for READ_RSP cifs: add a callback function to receive the rest of the frame cifs: break out 3rd receive phase into separate function cifs: find mid earlier in receive codepath ...
No related branches found
No related tags found
Showing
- fs/cifs/README 14 additions, 0 deletionsfs/cifs/README
- fs/cifs/cifs_debug.c 6 additions, 3 deletionsfs/cifs/cifs_debug.c
- fs/cifs/cifs_fs_sb.h 4 additions, 0 deletionsfs/cifs/cifs_fs_sb.h
- fs/cifs/cifsacl.c 291 additions, 56 deletionsfs/cifs/cifsacl.c
- fs/cifs/cifsencrypt.c 22 additions, 83 deletionsfs/cifs/cifsencrypt.c
- fs/cifs/cifsfs.c 16 additions, 8 deletionsfs/cifs/cifsfs.c
- fs/cifs/cifsfs.h 2 additions, 2 deletionsfs/cifs/cifsfs.h
- fs/cifs/cifsglob.h 47 additions, 8 deletionsfs/cifs/cifsglob.h
- fs/cifs/cifspdu.h 38 additions, 10 deletionsfs/cifs/cifspdu.h
- fs/cifs/cifsproto.h 39 additions, 9 deletionsfs/cifs/cifsproto.h
- fs/cifs/cifssmb.c 420 additions, 34 deletionsfs/cifs/cifssmb.c
- fs/cifs/connect.c 424 additions, 273 deletionsfs/cifs/connect.c
- fs/cifs/dir.c 18 additions, 4 deletionsfs/cifs/dir.c
- fs/cifs/export.c 2 additions, 2 deletionsfs/cifs/export.c
- fs/cifs/file.c 782 additions, 344 deletionsfs/cifs/file.c
- fs/cifs/inode.c 35 additions, 19 deletionsfs/cifs/inode.c
- fs/cifs/link.c 12 additions, 5 deletionsfs/cifs/link.c
- fs/cifs/misc.c 40 additions, 26 deletionsfs/cifs/misc.c
- fs/cifs/sess.c 3 additions, 1 deletionfs/cifs/sess.c
- fs/cifs/smbencrypt.c 0 additions, 121 deletionsfs/cifs/smbencrypt.c
Loading
Please register or sign in to comment