shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-06-07 07:17:09 +03:00
Code

nspawn: drop an unnecessary local variable

Browse Source
This commit is contained in:
Lennart Poettering 2021-04-28 17:24:34 +02:00
parent 21b61b1dd2
commit 993da6d461
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nspawn/nspawn.c
View File

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