diff options
| author | Linus Torvalds <[email protected]> | 2013-12-17 19:46:51 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-12-17 19:46:51 +0000 |
| commit | a5905a9205164023191e47f62ef9b3929ddcc48e (patch) | |
| tree | accc5e91974a96b653f2da3530b806a09076e22a /net/tipc/handler.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | ceph: Avoid data inconsistency due to d-cache aliasing in readpage() (diff) | |
| download | kernel-a5905a9205164023191e47f62ef9b3929ddcc48e.tar.gz kernel-a5905a9205164023191e47f62ef9b3929ddcc48e.zip | |
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 'net/tipc/handler.c')
0 files changed, 0 insertions, 0 deletions