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>
This commit is contained in:
parent
2e7035646e
commit
b11c9b7ee3
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue