diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-17 11:46:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-17 11:46:51 -0800 |
| commit | a5905a9205164023191e47f62ef9b3929ddcc48e (patch) | |
| tree | accc5e91974a96b653f2da3530b806a09076e22a /COPYING | |
| parent | 4ddebaf42dcddd4a3004b59a44fc8da6bce0aa6c (diff) | |
| parent | 56f91aad69444d650237295f68c195b74d888d95 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull two Ceph fixes from Sage Weil:
"One of these is fixing a regression from the d_flags file type patch
that went into -rc1 that broke instantiation of inodes and dentries
(we were doing dentries first). The other is just an off-by-one
corner case"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: Avoid data inconsistency due to d-cache aliasing in readpage()
ceph: initialize inode before instantiating dentry
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions