diff options
author | 2015-01-29 15:13:56 -0800 | |
---|---|---|
committer | 2015-01-29 15:13:56 -0800 | |
commit | 884e00f37d8b8464de6b1a5ee456957e530d6d8a (patch) | |
tree | c3652b03bd0dc739a93d8edd083961170b4d0da9 /fs/nfs/nfs4client.c | |
parent | Merge tag 'sound-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
parent | rbd: drop parent_ref in rbd_dev_unprobe() unconditionally (diff) | |
download | linux-dev-884e00f37d8b8464de6b1a5ee456957e530d6d8a.tar.xz linux-dev-884e00f37d8b8464de6b1a5ee456957e530d6d8a.zip |
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