|
 |
d01aaa |
From cc34aab2a455546431da8e8abb0d854a70c71962 Mon Sep 17 00:00:00 2001
|
|
|
d01aaa |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d01aaa |
Date: Tue, 9 Oct 2018 15:14:16 +0100
|
|
|
d01aaa |
Subject: [PATCH 3/6] sync: remove unnecessary checks
|
|
|
d01aaa |
|
|
|
d01aaa |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d01aaa |
Message-id: <20181009151419.20418-4-pbonzini@redhat.com>
|
|
|
d01aaa |
Patchwork-id: 82506
|
|
|
d01aaa |
O-Subject: [RHEL8 libiscsi PATCH 3/6] sync: remove unnecessary checks
|
|
|
d01aaa |
Bugzilla: 1634541
|
|
|
d01aaa |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
d01aaa |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
d01aaa |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d01aaa |
|
|
|
d01aaa |
state is always non-NULL in iscsi_sync_cb and iscsi_discovery_cb.
|
|
|
d01aaa |
|
|
|
d01aaa |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d01aaa |
(cherry picked from commit f507c94774bff0c851880813d95f5d0a8fbdace8)
|
|
|
d01aaa |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
d01aaa |
---
|
|
|
d01aaa |
lib/sync.c | 14 +++++---------
|
|
|
d01aaa |
1 file changed, 5 insertions(+), 9 deletions(-)
|
|
|
d01aaa |
|
|
|
d01aaa |
diff --git a/lib/sync.c b/lib/sync.c
|
|
|
d01aaa |
index 9fb78e7..34ed64e 100644
|
|
|
d01aaa |
--- a/lib/sync.c
|
|
|
d01aaa |
+++ b/lib/sync.c
|
|
|
d01aaa |
@@ -85,10 +85,8 @@ iscsi_sync_cb(struct iscsi_context *iscsi _U_, int status,
|
|
|
d01aaa |
{
|
|
|
d01aaa |
struct iscsi_sync_state *state = private_data;
|
|
|
d01aaa |
|
|
|
d01aaa |
- if (state != NULL) {
|
|
|
d01aaa |
- state->status = status;
|
|
|
d01aaa |
- state->finished = 1;
|
|
|
d01aaa |
- }
|
|
|
d01aaa |
+ state->status = status;
|
|
|
d01aaa |
+ state->finished = 1;
|
|
|
d01aaa |
}
|
|
|
d01aaa |
|
|
|
d01aaa |
int
|
|
|
d01aaa |
@@ -1818,11 +1816,9 @@ iscsi_discovery_cb(struct iscsi_context *iscsi _U_, int status,
|
|
|
d01aaa |
}
|
|
|
d01aaa |
}
|
|
|
d01aaa |
|
|
|
d01aaa |
- if (state != NULL) {
|
|
|
d01aaa |
- state->status = status;
|
|
|
d01aaa |
- state->finished = 1;
|
|
|
d01aaa |
- state->ptr = dahead;
|
|
|
d01aaa |
- }
|
|
|
d01aaa |
+ state->status = status;
|
|
|
d01aaa |
+ state->finished = 1;
|
|
|
d01aaa |
+ state->ptr = dahead;
|
|
|
d01aaa |
}
|
|
|
d01aaa |
|
|
|
d01aaa |
struct iscsi_discovery_address *
|
|
|
d01aaa |
--
|
|
|
d01aaa |
1.8.3.1
|
|
|
d01aaa |
|