summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-12-31 17:00:10 +0100
committerLennart Poettering <lennart@poettering.net>2019-01-07 17:50:39 +0100
commit16420be1fdd4a1430b4216d1ae9155914175ed42 (patch)
tree3156ef4b4392f767f8f1477eeedf775439b8069e
parent26c1be0fdcc2b4ce4b05d9174c0166152bdb9aa8 (diff)
downloadsystemd-16420be1fdd4a1430b4216d1ae9155914175ed42.tar.gz
loop-util: tweak codepath when a loopback file is "created" from an existing block device
Be more careful with initialized of the 'relinquished' boolean field, and let's return the fd, like we do for the regular codepath, too.
-rw-r--r--src/shared/loop-util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index e77eee6d3a..bf426eb8bc 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -45,11 +45,11 @@ int loop_device_make(int fd, int open_flags, LoopDevice **ret) {
*d = (LoopDevice) {
.fd = copy,
.nr = -1,
+ .relinquished = true, /* It's not allocated by us, don't destroy it when this object is freed */
};
*ret = d;
-
- return 0;
+ return d->fd;
}
r = stat_verify_regular(&st);