author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 13 Jun 2011 18:21:50 +0000 (11:21 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 13 Jun 2011 18:21:50 +0000 (11:21 -0700) |
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: unwind canceled flock state
ceph: fix ENOENT logic in striped_read
ceph: fix short sync reads from the OSD
ceph: fix sync vs canceled write
ceph: use ihold when we already have an inode ref
ceph: unwind canceled flock state
ceph: fix ENOENT logic in striped_read
ceph: fix short sync reads from the OSD
ceph: fix sync vs canceled write
ceph: use ihold when we already have an inode ref
Trivial merge