From: Karel Zak <kzak@redhat.com>
Date: Mon, 15 Aug 2022 15:32:40 +0000 (+0200)
Subject: libmount: (context) use default options maps
X-Git-Tag: v2.39-rc1~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93c4f825fdf773ba621b8a6b86b051c50449a622;p=thirdparty%2Futil-linux.git

libmount: (context) use default options maps

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/context.c b/libmount/src/context.c
index b73b329d41..8115ffc18f 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -1101,8 +1101,22 @@ struct libmnt_optlist *mnt_context_get_optlist(struct libmnt_context *cxt)
 {
 	if (!cxt)
 		return NULL;
-
-	return cxt->optlist ? : (cxt->optlist = mnt_new_optlist());
+	if (!cxt->optlist) {
+		cxt->optlist = mnt_new_optlist();
+		if (!cxt->optlist)
+			return NULL;
+		if (mnt_optlist_register_map(cxt->optlist,
+				mnt_get_builtin_optmap(MNT_LINUX_MAP)))
+			goto fail;
+		if (mnt_optlist_register_map(cxt->optlist,
+				mnt_get_builtin_optmap(MNT_USERSPACE_MAP)))
+			goto fail;
+	}
+
+	return cxt->optlist;
+fail:
+	mnt_unref_optlist(cxt->optlist);
+	return NULL;
 }
 
 /**