Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: mangle existing header for SMB_COM_NT_CANCEL cifs: remove code for setting timeouts on requests [CIFS] cifs: reconnect unresponsive servers cifs: set up recurring workqueue job to do SMB echo requests cifs: add ability to send an echo request cifs: add cifs_call_async cifs: allow for different handling of received response cifs: clean up sync_mid_result cifs: don't reconnect server when we don't get a response cifs: wait indefinitely for responses cifs: Use mask of ACEs for SID Everyone to calculate all three permissions user, group, and other cifs: Fix regression during share-level security mounts (Repost) [CIFS] Update cifs version number cifs: move mid result processing into common function cifs: move locked sections out of DeleteMidQEntry and AllocMidQEntry cifs: clean up accesses to midCount cifs: make wait_for_free_request take a TCP_Server_Info pointer cifs: no need to mark smb_ses_list as cifs_demultiplex_thread is exiting cifs: don't fail writepages on -EAGAIN errors CIFS: Fix oplock break handling (try #2)
Showing
- fs/cifs/cifs_debug.c 5 additions, 5 deletionsfs/cifs/cifs_debug.c
- fs/cifs/cifsacl.c 11 additions, 2 deletionsfs/cifs/cifsacl.c
- fs/cifs/cifsfs.c 5 additions, 1 deletionfs/cifs/cifsfs.c
- fs/cifs/cifsfs.h 1 addition, 1 deletionfs/cifs/cifsfs.h
- fs/cifs/cifsglob.h 21 additions, 7 deletionsfs/cifs/cifsglob.h
- fs/cifs/cifspdu.h 15 additions, 0 deletionsfs/cifs/cifspdu.h
- fs/cifs/cifsproto.h 8 additions, 1 deletionfs/cifs/cifsproto.h
- fs/cifs/cifssmb.c 54 additions, 5 deletionsfs/cifs/cifssmb.c
- fs/cifs/connect.c 75 additions, 74 deletionsfs/cifs/connect.c
- fs/cifs/file.c 55 additions, 59 deletionsfs/cifs/file.c
- fs/cifs/misc.c 1 addition, 1 deletionfs/cifs/misc.c
- fs/cifs/sess.c 1 addition, 1 deletionfs/cifs/sess.c
- fs/cifs/transport.c 203 additions, 224 deletionsfs/cifs/transport.c
Loading
Please register or sign in to comment