From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Apr 2021 15:24:34 +0000 (+0200)
Subject: nspawn: drop an unnecessary local variable
X-Git-Tag: v249-rc1~269^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=993da6d4616b56b7ef82c95f1b65494cdcf10c5c;p=thirdparty%2Fsystemd.git

nspawn: drop an unnecessary local variable
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d69b95598ee..72886a070b4 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3044,7 +3044,6 @@ static int chase_symlinks_and_update(char **p, unsigned flags) {
 }
 
 static int determine_uid_shift(const char *directory) {
-        int r;
 
         if (arg_userns_mode == USER_NAMESPACE_NO) {
                 arg_uid_shift = 0;
@@ -3054,8 +3053,9 @@ static int determine_uid_shift(const char *directory) {
         if (arg_uid_shift == UID_INVALID) {
                 struct stat st;
 
-                r = stat(directory, &st);
-                if (r < 0)
+                /* Read the UID shift off the image. Maybe we can reuse this to avoid chowning. */
+
+                if (stat(directory, &st) < 0)
                         return log_error_errno(errno, "Failed to determine UID base of %s: %m", directory);
 
                 arg_uid_shift = st.st_uid & UINT32_C(0xffff0000);