diff --git a/[refs] b/[refs]
index a0c663011844..a17e8a5f1fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 263c6ca007a6693fb724a24c5a55716c49d33573
+refs/heads/master: b7f6519e6bc7a0c5a9e3eadc8a2c79c0d4556050
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-rbd b/trunk/Documentation/ABI/testing/sysfs-bus-rbd
index dbedafb095e2..bcd88eb7ebcd 100644
--- a/trunk/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/trunk/Documentation/ABI/testing/sysfs-bus-rbd
@@ -65,11 +65,11 @@ snap_*
 Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>
 -------------------------------------------------------------
 
-id
+snap_id
 
 	The rados internal snapshot id assigned for this snapshot
 
-size
+snap_size
 
 	The size of the image when this snapshot was taken.