diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-29 15:13:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-29 15:13:56 -0800 |
| commit | 884e00f37d8b8464de6b1a5ee456957e530d6d8a (patch) | |
| tree | c3652b03bd0dc739a93d8edd083961170b4d0da9 /fs/nfs/nfs4client.c | |
| parent | a2ae004a988357b77ebf2a65a558d014da7c91b0 (diff) | |
| parent | e69b8d414f948c242ad9f3eb2b7e24fba783dbbd (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil:
"These paches from Ilya finally squash a race condition with layered
images that he's been chasing for a while"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: drop parent_ref in rbd_dev_unprobe() unconditionally
rbd: fix rbd_dev_parent_get() when parent_overlap == 0
Diffstat (limited to 'fs/nfs/nfs4client.c')
0 files changed, 0 insertions, 0 deletions