diff --git a/[refs] b/[refs]
index 6df6765511f7..41732bc656ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c0d0a10ea89456781218f458f6bf72e99d87d2a
+refs/heads/master: a92ffdf8a9b09f8fae9a8f418f87f30a5e459570
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index a8521338bf46..28052ff679ca 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1982,7 +1982,10 @@ static ssize_t rbd_name_show(struct device *dev,
 {
 	struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
 
-	return sprintf(buf, "%s\n", rbd_dev->spec->image_name);
+	if (rbd_dev->spec->image_name)
+		return sprintf(buf, "%s\n", rbd_dev->spec->image_name);
+
+	return sprintf(buf, "(unknown)\n");
 }
 
 static ssize_t rbd_image_id_show(struct device *dev,