From: Jeff Cody <jcody@redhat.com>
Date: Tue, 7 Nov 2017 22:27:20 +0000 (-0500)
Subject: block/sheepdog: remove spurious NULL check
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac90dad94b5b1eda18a9a86c739c249d851cd35c;p=qemu.git

block/sheepdog: remove spurious NULL check

'tag' is already checked in the lines immediately preceding this check,
and set to non-NULL if NULL.  No need to check again, it hasn't changed.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---

diff --git a/block/sheepdog.c b/block/sheepdog.c
index 696a71442a..459d93a35f 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1632,7 +1632,7 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags,
     if (!tag) {
         tag = "";
     }
-    if (tag && strlen(tag) >= SD_MAX_VDI_TAG_LEN) {
+    if (strlen(tag) >= SD_MAX_VDI_TAG_LEN) {
         error_setg(errp, "value of parameter 'tag' is too long");
         ret = -EINVAL;
         goto err_no_fd;