From: Karel Zak <kzak@redhat.com>
Date: Thu, 12 Jul 2012 15:43:34 +0000 (+0200)
Subject: libmount: rename mnt_context_fstab_applied to mnt_context_tab_applied
X-Git-Tag: v2.22-rc1~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b11c9b7ee3a2f2b1dbe2f1ab0d0f5dde00ac2d40;p=thirdparty%2Futil-linux.git

libmount: rename mnt_context_fstab_applied to mnt_context_tab_applied

The function is also usable in umount to detect is mtab has been
applied.

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

diff --git a/libmount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt
index 1b9597387c..e9a6dce720 100644
--- a/libmount/docs/libmount-sections.txt
+++ b/libmount/docs/libmount-sections.txt
@@ -32,7 +32,7 @@ mnt_context_enable_loopdel
 mnt_context_enable_rdonly_umount
 mnt_context_enable_sloppy
 mnt_context_enable_verbose
-mnt_context_fstab_applied
+mnt_context_tab_applied
 mnt_context_get_cache
 mnt_context_get_fs
 mnt_context_get_fstab
diff --git a/libmount/src/context.c b/libmount/src/context.c
index ce1175e030..e0b6a35f4a 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -1687,7 +1687,7 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt)
 	if (!cxt)
 		return -EINVAL;
 
-	if (mnt_context_fstab_applied(cxt))
+	if (mnt_context_tab_applied(cxt))	/* already applied */
 		return 0;
 
 	if (mnt_context_is_restricted(cxt)) {
@@ -1757,12 +1757,12 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt)
 }
 
 /**
- * mnt_context_fstab_applied:
+ * mnt_context_tab_applied:
  * @cxt: mount context
  *
  * Returns: 1 if fstab (or mtab) has been applied to the context, or 0.
  */
-int mnt_context_fstab_applied(struct libmnt_context *cxt)
+int mnt_context_tab_applied(struct libmnt_context *cxt)
 {
 	return cxt && (cxt->flags & MNT_FL_TAB_APPLIED);
 }
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 6b87f984c3..2c66871b74 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -532,7 +532,7 @@ extern int mnt_context_do_umount(struct libmnt_context *cxt);
 extern int mnt_context_finalize_umount(struct libmnt_context *cxt);
 
 
-extern int mnt_context_fstab_applied(struct libmnt_context *cxt);
+extern int mnt_context_tab_applied(struct libmnt_context *cxt);
 extern int mnt_context_set_syscall_status(struct libmnt_context *cxt, int status);
 
 /*
diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym
index d07b570f14..39f81d665b 100644
--- a/libmount/src/libmount.sym
+++ b/libmount/src/libmount.sym
@@ -230,7 +230,7 @@ MOUNT_2.22 {
 global:
 	mnt_fs_streq_target;
 	mnt_fs_streq_srcpath;
-	mnt_context_fstab_applied;
+	mnt_context_tab_applied;
 	mnt_context_get_options;
 	mnt_context_is_loopdel;
 	mnt_context_is_nocanonicalize;