diff options
| author | Stanislav Brabec | 2016-04-12 20:22:36 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-04-22 12:50:14 +0200 |
| commit | 6e258026754ff7db97d6ac390e26ad1cc2e866e0 (patch) | |
| tree | a6e94c24abf53a594a67af324920851d839f4b8a /libmount/src/context_loopdev.c | |
| parent | getopt: keep pointer to 'name' in control struct (diff) | |
| download | kernel-qcow2-util-linux-6e258026754ff7db97d6ac390e26ad1cc2e866e0.tar.gz kernel-qcow2-util-linux-6e258026754ff7db97d6ac390e26ad1cc2e866e0.tar.xz kernel-qcow2-util-linux-6e258026754ff7db97d6ac390e26ad1cc2e866e0.zip | |
libmount: Re-organize is_mounted_same_loopfile()
First parse options, then initialize context.
No change in function.
The change is needed for loop device reuse.
Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
Diffstat (limited to 'libmount/src/context_loopdev.c')
| -rw-r--r-- | libmount/src/context_loopdev.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c index a1ff971c6..47d6294c1 100644 --- a/libmount/src/context_loopdev.c +++ b/libmount/src/context_loopdev.c @@ -137,7 +137,7 @@ is_mounted_same_loopfile(struct libmnt_context *cxt, int mnt_context_setup_loopdev(struct libmnt_context *cxt) { const char *backing_file, *optstr, *loopdev = NULL; - char *val = NULL; + char *val = NULL, *loopval = NULL; size_t len; struct loopdev_cxt lc; int rc = 0, lo_flags = 0; @@ -158,10 +158,6 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt) lo_flags |= LO_FLAGS_READ_ONLY; } - rc = loopcxt_init(&lc, 0); - if (rc) - return rc; - optstr = mnt_fs_get_user_options(cxt->fs); /* @@ -169,13 +165,8 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt) */ if (rc == 0 && (cxt->user_mountflags & MNT_MS_LOOP) && mnt_optstr_get_option(optstr, "loop", &val, &len) == 0 && val) { - - val = strndup(val, len); - rc = val ? loopcxt_set_device(&lc, val) : -ENOMEM; - free(val); - - if (rc == 0) - loopdev = loopcxt_get_device(&lc); + loopval = strndup(val, len); + rc = loopval ? 0 : -ENOMEM; } /* @@ -217,6 +208,15 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt) rc = -EBUSY; if (rc) + goto done_no_deinit; + + rc = loopcxt_init(&lc, 0); + if (rc == 0 && loopval) { + rc = loopcxt_set_device(&lc, loopval); + if (rc == 0) + loopdev = loopcxt_get_device(&lc); + } + if (rc) goto done; /* since 2.6.37 we don't have to store backing filename to mtab @@ -301,6 +301,8 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt) } done: loopcxt_deinit(&lc); +done_no_deinit: + free(loopval); return rc; } |