libmount: use separate buffer for userspace options, add mount attributes

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

1 files changed, 33 insertions, 25 deletions

diff --git a/shlibs/mount/src/mount.sym b/shlibs/mount/src/mount.sym
index 07259d27b..5d51cded1 100644
--- a/shlibs/mount/src/mount.sym
+++ b/shlibs/mount/src/mount.sym
@@ -15,18 +15,23 @@ global:
 	mnt_free_fs;
 	mnt_free_iter;
 	mnt_free_lock;
-	mnt_free_update;
+	mnt_free_mntent;
 	mnt_free_optls;
 	mnt_free_tab;
-	mnt_fs_append_optstr;
-	mnt_fs_append_userspace_optstr;
+	mnt_free_update;
+	mnt_fs_append_attributes;
+	mnt_fs_append_fs_options;
+	mnt_fs_append_options;
+	mnt_fs_append_userspace_options;
+	mnt_fs_append_vfs_options;
+	mnt_fs_get_attributes;
+	mnt_fs_get_attribute;
 	mnt_fs_get_devno;
 	mnt_fs_get_freq;
-	mnt_fs_get_fs_optstr;
+	mnt_fs_get_fs_options;
 	mnt_fs_get_fstype;
 	mnt_fs_get_id;
 	mnt_fs_get_option;
-	mnt_fs_get_optstr;
 	mnt_fs_get_parent_id;
 	mnt_fs_get_passno;
 	mnt_fs_get_root;
@@ -35,28 +40,40 @@ global:
 	mnt_fs_get_tag;
 	mnt_fs_get_target;
 	mnt_fs_get_userdata;
-	mnt_fs_get_vfs_optstr;
+	mnt_fs_get_userspace_options;
+	mnt_fs_get_vfs_options;
+	mnt_fs_set_vfs_options;
 	mnt_fs_match_fstype;
 	mnt_fs_match_options;
 	mnt_fs_match_source;
 	mnt_fs_match_target;
-	mnt_fs_prepend_optstr;
+	mnt_fs_prepend_attributes;
+	mnt_fs_prepend_fs_options;
+	mnt_fs_prepend_options;
+	mnt_fs_prepend_userspace_options;
+	mnt_fs_prepend_vfs_options;
 	mnt_fs_print_debug;
+	mnt_fs_set_attributes;
 	mnt_fs_set_freq;
+	mnt_fs_set_fs_options;
 	mnt_fs_set_fstype;
-	mnt_fs_set_optstr;
+	mnt_fs_set_options;
 	mnt_fs_set_passno;
 	mnt_fs_set_root;
 	mnt_fs_set_source;
 	mnt_fs_set_target;
 	mnt_fs_set_userdata;
+	mnt_fs_set_userspace_options;
+	mnt_fs_strdup_options;
+	mnt_fs_to_mntent;
 	mnt_fstype_is_netfs;
 	mnt_fstype_is_pseudofs;
 	mnt_get_builtin_optmap;
-	mnt_get_library_version;
-	mnt_get_writable_mtab_path;
 	mnt_get_fstab_path;
+	mnt_get_fstype;
+	mnt_get_library_version;
 	mnt_get_mtab_path;
+	mnt_get_writable_mtab_path;
 	mnt_init_debug;
 	mnt_iter_get_direction;
 	mnt_lock_file;
@@ -69,30 +86,23 @@ global:
 	mnt_new_fs;
 	mnt_new_iter;
 	mnt_new_lock;
-	mnt_new_update;
 	mnt_new_optls;
 	mnt_new_tab;
 	mnt_new_tab_from_file;
+	mnt_new_update;
 	mnt_optstr_append_option;
-	mnt_optstr_get_mountflags;
+	mnt_optstr_apply_flags;
+	mnt_optstr_get_flags;
 	mnt_optstr_get_option;
-	mnt_optstr_get_userspace_mountflags;
 	mnt_optstr_next_option;
 	mnt_optstr_prepend_option;
 	mnt_optstr_remove_option;
 	mnt_optstr_set_option;
-	mnt_optstr_fix_gid;
-	mnt_optstr_fix_selinux;
-	mnt_optstr_fix_uid;
-	mnt_optstr_fix_user;
-	mnt_optstr_apply_flags;
-	mnt_optstr_get_flags;
 	mnt_parse_version_string;
 	mnt_reset_iter;
 	mnt_resolve_path;
 	mnt_resolve_spec;
 	mnt_resolve_tag;
-	mnt_get_fstype;
 	mnt_split_optstr;
 	mnt_tab_add_fs;
 	mnt_tab_find_next_fs;
@@ -119,8 +129,10 @@ global:
 	mnt_unlock_file;
 	mnt_unmangle;
 	mnt_update_disable_lock;
-	mnt_update_get_lock;
 	mnt_update_file;
+	mnt_update_get_filename;
+	mnt_update_get_format;
+	mnt_update_get_lock;
 	mnt_update_prepare_update;
 	mnt_update_set_action;
 	mnt_update_set_filename;
@@ -128,10 +140,6 @@ global:
 	mnt_update_set_fs;
 	mnt_update_set_mountflags;
 	mnt_update_set_old_target;
-	mnt_update_get_format;
-	mnt_update_get_filename;
-	mnt_fs_to_mntent;
-	mnt_free_mntent;
 local:
 	*;
 };