From: Mike Snitzer <snitzer@redhat.com>
Date: Sun, 16 Nov 2014 19:21:47 +0000 (-0500)
Subject: dm: return earlier from dm_blk_ioctl if target doesn't implement .ioctl
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4d341d8216336174d35cd2575b6b9e4267a88ac8;p=openwrt%2Fstaging%2Fblogic.git

dm: return earlier from dm_blk_ioctl if target doesn't implement .ioctl

No point checking if the device is suspended if the current target
doesn't even implement .ioctl

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 866ff19aa438..f8cdd97c28a7 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -525,14 +525,15 @@ retry:
 		goto out;
 
 	tgt = dm_table_get_target(map, 0);
+	if (!tgt->type->ioctl)
+		goto out;
 
 	if (dm_suspended_md(md)) {
 		r = -EAGAIN;
 		goto out;
 	}
 
-	if (tgt->type->ioctl)
-		r = tgt->type->ioctl(tgt, cmd, arg);
+	r = tgt->type->ioctl(tgt, cmd, arg);
 
 out:
 	dm_put_live_table(md, srcu_idx);