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: (205 commits) ceph: update for write_inode API change ceph: reset osd after relevant messages timed out ceph: fix flush_dirty_caps race with caps migration ceph: include migrating caps in issued set ceph: fix osdmap decoding when pools include (removed) snaps ceph: return EBADF if waiting for caps on closed file ceph: set osd request message front length correctly ceph: reset front len on return to msgpool; BUG on mismatched front iov ceph: fix snaptrace decoding on cap migration between mds ceph: use single osd op reply msg ceph: reset bits on connection close ceph: remove bogus mds forward warning ceph: remove fragile __map_osds optimization ceph: fix connection fault STANDBY check ceph: invalidate_authorizer without con->mutex held ceph: don't clobber write return value when using O_SYNC ceph: fix client_request_forward decoding ceph: drop messages on unregistered mds sessions; cleanup ceph: fix comments, locking in destroy_inode ceph: move dereference after NULL test ... Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt
Showing
fs/ceph/Kconfig
0 → 100644
fs/ceph/Makefile
0 → 100644
fs/ceph/README
0 → 100644
fs/ceph/addr.c
0 → 100644
This diff is collapsed.
fs/ceph/armor.c
0 → 100644
fs/ceph/auth.c
0 → 100644
fs/ceph/auth.h
0 → 100644
fs/ceph/auth_none.c
0 → 100644
fs/ceph/auth_none.h
0 → 100644
fs/ceph/auth_x.c
0 → 100644
This diff is collapsed.
fs/ceph/auth_x.h
0 → 100644
fs/ceph/auth_x_protocol.h
0 → 100644
fs/ceph/buffer.c
0 → 100644
fs/ceph/buffer.h
0 → 100644
fs/ceph/caps.c
0 → 100644
This diff is collapsed.
fs/ceph/ceph_debug.h
0 → 100644
fs/ceph/ceph_frag.c
0 → 100644
fs/ceph/ceph_frag.h
0 → 100644
fs/ceph/ceph_fs.c
0 → 100644
fs/ceph/ceph_fs.h
0 → 100644
This diff is collapsed.
fs/ceph/ceph_hash.c
0 → 100644
fs/ceph/ceph_hash.h
0 → 100644
fs/ceph/ceph_strings.c
0 → 100644
fs/ceph/crush/crush.c
0 → 100644
fs/ceph/crush/crush.h
0 → 100644
fs/ceph/crush/hash.c
0 → 100644
fs/ceph/crush/hash.h
0 → 100644
fs/ceph/crush/mapper.c
0 → 100644
This diff is collapsed.
fs/ceph/crush/mapper.h
0 → 100644
fs/ceph/crypto.c
0 → 100644
This diff is collapsed.
fs/ceph/crypto.h
0 → 100644
fs/ceph/debugfs.c
0 → 100644
This diff is collapsed.
fs/ceph/decode.h
0 → 100644
fs/ceph/dir.c
0 → 100644
This diff is collapsed.
fs/ceph/export.c
0 → 100644
This diff is collapsed.
fs/ceph/file.c
0 → 100644
This diff is collapsed.
fs/ceph/inode.c
0 → 100644
This diff is collapsed.
fs/ceph/ioctl.c
0 → 100644
This diff is collapsed.
fs/ceph/ioctl.h
0 → 100644
fs/ceph/mds_client.c
0 → 100644
This diff is collapsed.
fs/ceph/mds_client.h
0 → 100644
This diff is collapsed.
fs/ceph/mdsmap.c
0 → 100644
This diff is collapsed.
fs/ceph/mdsmap.h
0 → 100644
fs/ceph/messenger.c
0 → 100644
This diff is collapsed.
fs/ceph/messenger.h
0 → 100644
This diff is collapsed.
fs/ceph/mon_client.c
0 → 100644
This diff is collapsed.
fs/ceph/mon_client.h
0 → 100644
This diff is collapsed.
fs/ceph/msgpool.c
0 → 100644
This diff is collapsed.
fs/ceph/msgpool.h
0 → 100644
This diff is collapsed.
fs/ceph/msgr.h
0 → 100644
This diff is collapsed.
fs/ceph/osd_client.c
0 → 100644
This diff is collapsed.
fs/ceph/osd_client.h
0 → 100644
This diff is collapsed.
fs/ceph/osdmap.c
0 → 100644
This diff is collapsed.
fs/ceph/osdmap.h
0 → 100644
This diff is collapsed.
fs/ceph/pagelist.c
0 → 100644
This diff is collapsed.
fs/ceph/pagelist.h
0 → 100644
This diff is collapsed.
fs/ceph/rados.h
0 → 100644
This diff is collapsed.
fs/ceph/snap.c
0 → 100644
This diff is collapsed.
fs/ceph/super.c
0 → 100644
This diff is collapsed.
fs/ceph/super.h
0 → 100644
This diff is collapsed.
fs/ceph/types.h
0 → 100644
This diff is collapsed.
fs/ceph/xattr.c
0 → 100644
This diff is collapsed.
Please register or sign in to comment