| commit | e97b71ded9ebe527681961c9e6f5ba99f6711974 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 11:02:15 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 11:02:15 2010 -0800 |
| tree | a724e6f951456f1d855b55e3f34e3710b37f9f9a | |
| parent | 38971ce2fac484249d697fe48a9b0851a0b62572 [diff] | |
| parent | 1cd275f609ba46c8cae3ee77e499c54a0d13a983 [diff] |
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: fix ioctl magic ceph: Behave better when handling file lock replies. ceph: pass lock information by struct file_lock instead of as individual params. ceph: Handle file locks in replies from the MDS. ceph: avoid possible null deref in readdir after dir llseek