diff --git a/[refs] b/[refs]
index e7cec3585f70..8c04bb4dae9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7698f2f5e0d7b7a062213fa970b7c4e121adf38e
+refs/heads/master: 843a0d0879935742bb7270c9dc8d94abb8b39cee
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 8e6e29eacb1a..14bf83ba45d3 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -522,11 +522,11 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
 
 	snap_count = le32_to_cpu(ondisk->snap_count);
 
-	size = sizeof (ondisk->block_name) + 1;
+	size = sizeof (ondisk->object_prefix) + 1;
 	header->object_prefix = kmalloc(size, GFP_KERNEL);
 	if (!header->object_prefix)
 		return -ENOMEM;
-	memcpy(header->object_prefix, ondisk->block_name, size - 1);
+	memcpy(header->object_prefix, ondisk->object_prefix, size - 1);
 	header->object_prefix[size - 1] = '\0';
 
 	if (snap_count) {
diff --git a/trunk/drivers/block/rbd_types.h b/trunk/drivers/block/rbd_types.h
index 0924e9e41a60..d9d8a77748bc 100644
--- a/trunk/drivers/block/rbd_types.h
+++ b/trunk/drivers/block/rbd_types.h
@@ -47,7 +47,7 @@ struct rbd_image_snap_ondisk {
 
 struct rbd_image_header_ondisk {
 	char text[40];
-	char block_name[24];
+	char object_prefix[24];
 	char signature[4];
 	char version[8];
 	struct {