diff --git a/[refs] b/[refs]
index 532b617f6549..0f53a64b2072 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61c74035626beb25a39b0273ccf7d75510bc36a1
+refs/heads/master: b8f5c6edca34ff441e1ccdec68828e933a1b905b
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index ce26b749ede0..4daa400c13aa 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -2456,7 +2456,7 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
 
 	incompat = le64_to_cpu(features_buf.incompat);
 	if (incompat & ~RBD_FEATURES_ALL)
-		return -ENOTSUPP;
+		return -ENXIO;
 
 	*snap_features = le64_to_cpu(features_buf.features);