Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French: "Small set of cifs fixes. Most important is Jeff's fix that works around disconnection problems which can be caused by simultaneous use of user space tools (starting a long running smbclient backup then doing a cifs kernel mount) or multiple cifs mounts through a NAT, and Jim's fix to deal with reexport of cifs share. I expect to send two more cifs fixes next week (being tested now) - fixes to address an SMB2 unmount hang when server dies and a fix for cifs symlink handling of Windows "NFS" symlinks" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: [CIFS] update cifs.ko version [CIFS] Remove ext2 flags that have been moved to fs.h [CIFS] Provide sane values for nlink cifs: stop trying to use virtual circuits CIFS: FS-Cache: Uncache unread pages in cifs_readpages() before freeing them
No related branches found
No related tags found
Showing
- fs/cifs/cifsfs.h 1 addition, 1 deletionfs/cifs/cifsfs.h
- fs/cifs/cifsglob.h 1 addition, 4 deletionsfs/cifs/cifsglob.h
- fs/cifs/cifspdu.h 1 addition, 20 deletionsfs/cifs/cifspdu.h
- fs/cifs/cifssmb.c 0 additions, 1 deletionfs/cifs/cifssmb.c
- fs/cifs/file.c 8 additions, 0 deletionsfs/cifs/file.c
- fs/cifs/fscache.c 7 additions, 0 deletionsfs/cifs/fscache.c
- fs/cifs/fscache.h 13 additions, 0 deletionsfs/cifs/fscache.h
- fs/cifs/inode.c 39 additions, 6 deletionsfs/cifs/inode.c
- fs/cifs/readdir.c 3 additions, 0 deletionsfs/cifs/readdir.c
- fs/cifs/sess.c 1 addition, 83 deletionsfs/cifs/sess.c
Please register or sign in to comment