discover-image: don't mix two types of stack allocation in one line
This commit is contained in:
@@ -1065,7 +1065,6 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
|
||||
r = asprintf(&p, "/run/systemd/nspawn/locks/inode-%lu:%lu", (unsigned long) st.st_dev, (unsigned long) st.st_ino);
|
||||
else
|
||||
return -ENOTTY;
|
||||
|
||||
if (r < 0)
|
||||
return -ENOMEM;
|
||||
}
|
||||
@@ -1220,11 +1219,16 @@ int image_read_metadata(Image *i) {
|
||||
}
|
||||
|
||||
int image_name_lock(const char *name, int operation, LockFile *ret) {
|
||||
const char *p;
|
||||
|
||||
assert(name);
|
||||
assert(ret);
|
||||
|
||||
/* Locks an image name, regardless of the precise path used. */
|
||||
|
||||
if (streq(name, ".host"))
|
||||
return -EBUSY;
|
||||
|
||||
if (!image_name_is_valid(name))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -1233,11 +1237,9 @@ int image_name_lock(const char *name, int operation, LockFile *ret) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (streq(name, ".host"))
|
||||
return -EBUSY;
|
||||
|
||||
const char *p = strjoina("/run/systemd/nspawn/locks/name-", name);
|
||||
(void) mkdir_p("/run/systemd/nspawn/locks", 0700);
|
||||
|
||||
p = strjoina("/run/systemd/nspawn/locks/name-", name);
|
||||
return make_lock_file(p, operation, ret);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user