From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 19 Feb 2013 22:53:54 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.58~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bcb210c677d31f3209fddbb4ada17fee3f9b18da;p=ceph.git

Merge branch 'next'
---

bcb210c677d31f3209fddbb4ada17fee3f9b18da
diff --cc qa/workunits/rbd/map-snapshot-io.sh
index 882bf5d2dbc4,b53a81387d4f..c16030e2d8e8
--- a/qa/workunits/rbd/map-snapshot-io.sh
+++ b/qa/workunits/rbd/map-snapshot-io.sh
@@@ -15,8 -15,14 +15,15 @@@ rbd snap create image@s
  dd if=/dev/zero of=/dev/rbd/rbd/image oflag=direct count=10   # used to fail
  rbd snap rm image@s1
  dd if=/dev/zero of=/dev/rbd/rbd/image oflag=direct count=10
+ 
+ udevadm settle  # udev is does blkid on device close; yeesh!  see #4183
+ 
  rbd unmap /dev/rbd/rbd/image
 +rbd rm image
  
+ # wait a few seconds for the async kernel bits to clean themselves up
+ sleep 4
+ rbd rm image || :
+ 
  echo OK