Re: [PATCH 20/30] security: dac: Drop !parent handling in SetImageLabelInternal

Daniel Henrique Barboza <danielhb413@xxxxxxxxx> · Thu, 10 Oct 2019 12:31:12 -0300

On 10/7/19 6:49 PM, Cole Robinson wrote:
The only caller always passes in a non-null parent

Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
---

Reviewed-by: Daniel Henrique Barboza <danielhb413@xxxxxxxxx>

  src/security/security_dac.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 4b4afef18a..bcc781213e 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -893,9 +893,8 @@ virSecurityDACSetImageLabelInternal(virSecurityManagerPtr mgr,
          return 0;
  
      disk_seclabel = virStorageSourceGetSecurityLabelDef(src, SECURITY_DAC_NAME);
-    if (parent)
-        parent_seclabel = virStorageSourceGetSecurityLabelDef(parent,
-                                                              SECURITY_DAC_NAME);
+    parent_seclabel = virStorageSourceGetSecurityLabelDef(parent,
+                                                          SECURITY_DAC_NAME);
  
      if (disk_seclabel && (!disk_seclabel->relabel || disk_seclabel->label)) {
          if (!disk_seclabel->relabel)

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list






