From: Karel Zak <kzak@redhat.com>
Date: Fri, 6 Aug 2010 11:11:52 +0000 (+0200)
Subject: libmount: update mount.{h,sym}
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8378ede9ecd8447679ea6405d782d09e1591bc82;p=util-linux

libmount: update mount.{h,sym}

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

diff --git a/shlibs/mount/src/mount.h.in b/shlibs/mount/src/mount.h.in
index 3283630c..35499c8b 100644
--- a/shlibs/mount/src/mount.h.in
+++ b/shlibs/mount/src/mount.h.in
@@ -104,6 +104,9 @@ enum {
 	MNT_FMT_MOUNTINFO               /* /proc/#/mountinfo */
 };
 
+/*
+ * Actions
+ */
 enum {
 	MNT_ACT_MOUNT = 1,
 	MNT_ACT_UMOUNT
@@ -190,7 +193,7 @@ extern int mnt_lock_file(mnt_lock *ml);
 /* fs.c */
 extern mnt_fs *mnt_new_fs(void);
 extern void mnt_free_fs(mnt_fs *ent);
-extern mnt_fs *mnt_copy_fs(mnt_fs *fs);
+extern mnt_fs *mnt_copy_fs(const mnt_fs *fs);
 extern void *mnt_fs_get_userdata(mnt_fs *fs);
 extern int mnt_fs_set_userdata(mnt_fs *fs, void *data);
 extern const char *mnt_fs_get_source(mnt_fs *ent);
@@ -258,6 +261,21 @@ extern int mnt_tab_find_next_fs(mnt_tab *tb, mnt_iter *itr,
 			int (*match_func)(mnt_fs *, void *), void *userdata,
 		        mnt_fs **fs);
 
+/* mtab.c */
+extern mnt_mtab *mnt_new_mtab(int action, unsigned long mountflags, const mnt_fs *fs);
+extern void mnt_free_mtab(mnt_mtab *mt);
+extern int mnt_mtab_set_filename(mnt_mtab *mt, const char *filename);
+extern int mnt_mtab_set_action(mnt_mtab *mt, int action);
+extern int mnt_mtab_set_format(mnt_mtab *mt, int format);
+extern int mnt_mtab_set_mountflags(mnt_mtab *mt, unsigned long flags);
+extern mnt_lock *mnt_mtab_get_lock(mnt_mtab *mt);
+extern int mnt_mtab_disable_lock(mnt_mtab *mt, int disable);
+extern int mnt_mtab_set_old_target(mnt_mtab *mt, const char *target);
+extern int mnt_mtab_set_fs(mnt_mtab *mt, const mnt_fs *fs);
+
+extern int mnt_mtab_prepare_update(mnt_mtab *mt);
+extern int mnt_update_mtab(mnt_mtab *mt);
+
 /*
  * mount(8) userspace options masks (MNT_MAP_USERSPACE map)
  */
diff --git a/shlibs/mount/src/mount.sym b/shlibs/mount/src/mount.sym
index cf0f7753..84324514 100644
--- a/shlibs/mount/src/mount.sym
+++ b/shlibs/mount/src/mount.sym
@@ -15,6 +15,7 @@ global:
 	mnt_free_fs;
 	mnt_free_iter;
 	mnt_free_lock;
+	mnt_free_mtab;
 	mnt_free_optls;
 	mnt_free_tab;
 	mnt_fs_append_optstr;
@@ -60,10 +61,20 @@ global:
 	mnt_mangle;
 	mnt_match_fstype;
 	mnt_match_options;
+	mnt_mtab_disable_lock;
+	mnt_mtab_get_lock;
+	mnt_mtab_prepare_update;
+	mnt_mtab_set_action;
+	mnt_mtab_set_filename;
+	mnt_mtab_set_format;
+	mnt_mtab_set_fs;
+	mnt_mtab_set_mountflags;
+	mnt_mtab_set_old_target;
 	mnt_new_cache;
 	mnt_new_fs;
 	mnt_new_iter;
 	mnt_new_lock;
+	mnt_new_mtab;
 	mnt_new_optls;
 	mnt_new_tab;
 	mnt_new_tab_from_file;
@@ -137,6 +148,7 @@ global:
 	mnt_tab_update_file;
 	mnt_unlock_file;
 	mnt_unmangle;
+	mnt_update_mtab;
 local:
 	*;
 };