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: no .snap inside of snapped namespace libceph: fix msgr standby handling libceph: fix msgr keepalive flag libceph: fix msgr backoff libceph: retry after authorization failure libceph: fix handling of short returns from get_user_pages ceph: do not clear I_COMPLETE from d_release ceph: do not set I_COMPLETE Revert "ceph: keep reference to parent inode on ceph_dentry"
Showing
- fs/ceph/dir.c 3 additions, 25 deletionsfs/ceph/dir.c
- fs/ceph/inode.c 1 addition, 1 deletionfs/ceph/inode.c
- fs/ceph/super.h 0 additions, 1 deletionfs/ceph/super.h
- include/linux/ceph/messenger.h 1 addition, 1 deletioninclude/linux/ceph/messenger.h
- net/ceph/messenger.c 54 additions, 17 deletionsnet/ceph/messenger.c
- net/ceph/pagevec.c 13 additions, 5 deletionsnet/ceph/pagevec.c
Loading
Please register or sign in to comment