Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: select CRYPTO ceph: check mapping to determine if FILE_CACHE cap is used ceph: only send one flushsnap per cap_snap per mds session ceph: fix cap_snap and realm split ceph: stop sending FLUSHSNAPs when we hit a dirty capsnap ceph: correctly set 'follows' in flushsnap messages ceph: fix dn offset during readdir_prepopulate ceph: fix file offset wrapping at 4GB on 32-bit archs ceph: fix reconnect encoding for old servers ceph: fix pagelist kunmap tail ceph: fix null pointer deref on anon root dentry release
Showing
- fs/ceph/Kconfig 1 addition, 0 deletionsfs/ceph/Kconfig
- fs/ceph/addr.c 4 additions, 3 deletionsfs/ceph/addr.c
- fs/ceph/caps.c 19 additions, 8 deletionsfs/ceph/caps.c
- fs/ceph/dir.c 7 additions, 3 deletionsfs/ceph/dir.c
- fs/ceph/inode.c 6 additions, 5 deletionsfs/ceph/inode.c
- fs/ceph/mds_client.c 2 additions, 0 deletionsfs/ceph/mds_client.c
- fs/ceph/pagelist.c 10 additions, 2 deletionsfs/ceph/pagelist.c
- fs/ceph/snap.c 31 additions, 61 deletionsfs/ceph/snap.c
- fs/ceph/super.h 4 additions, 1 deletionfs/ceph/super.h
Loading
Please register or sign in to comment