ahill/nilfs-utils
1
0
Fork 0
mirror of https://github.com/nilfs-dev/nilfs-utils.git synced 2026-01-26 13:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

mount_libmount: generalize mount entry search function

Browse Source 
Add a general-purpose mount entry search function nilfs_find_mount(),
which makes nilfs_find_rw_mount() more general and allows the caller to
specify matching conditions for the mount point and mount options.

This is a preparation to resolve issues with cleanerd state management
in {mount,umount}_libmount.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
This commit is contained in:
Ryusuke Konishi 2024-02-13 21:52:58 +09:00
parent ade3f91ba9
commit 1907f5bf07
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sbin/mount/mount_libmount.c
View File

@ -220,12 +220,33 @@ static void nilfs_mount_parse_options(int argc, char *argv[],
}
}
static struct libmnt_fs *nilfs_find_rw_mount(struct libmnt_context *cxt,
struct libmnt_table *mtab)
/**
* nilfs_find_mount - find matching nilfs entry from mount table
* @cxt: mount context
* @mtab: pointer to tab
* @target: pointer to mountpoint path or %NULL
* @options: comma delimited list of options (and nooptions)
*
* This function searches in reverse order for an entry in the mount table
* given by @mtab that matches the device and file system type in @cxt.
* If @target and @options are not %NULL, the corresponding mount points and
* mount options are also added to the matching conditions.
*
* For details on the format of @options, see the specification of
* mnt_match_options().
*
* Return: If a matching entry is found, its FS description, or %NULL if not
* found.
*/
static struct libmnt_fs *nilfs_find_mount(struct libmnt_context *cxt,
struct libmnt_table *mtab,
const char *target,
const char *options)
{
struct libmnt_iter *iter = mnt_new_iter(MNT_ITER_BACKWARD);
const char *src = mnt_context_get_source(cxt);
const char *type = mnt_context_get_fstype(cxt);
struct libmnt_cache *cache = mnt_table_get_cache(mtab);
struct libmnt_fs *fs = NULL;
if (!iter)
@ -233,8 +254,9 @@ static struct libmnt_fs *nilfs_find_rw_mount(struct libmnt_context *cxt,
while (mnt_table_next_fs(mtab, iter, &fs) == 0) {
if (mnt_fs_match_fstype(fs, type) &&
mnt_fs_match_source(fs, src, mnt_table_get_cache(mtab)) &&
mnt_fs_match_options(fs, "rw"))
mnt_fs_match_source(fs, src, cache) &&
(!target || mnt_fs_match_target(fs, target, cache)) &&
(!options || mnt_fs_match_options(fs, options)))
break;
}
@ -242,6 +264,20 @@ static struct libmnt_fs *nilfs_find_rw_mount(struct libmnt_context *cxt,
return fs;
}
/**
* nilfs_find_rw_mount - find nilfs read/write mount entry from mount table
* @cxt: mount context
* @mtab: pointer to tab
*
* Return: If a matching entry is found, its FS description, or NULL if not
* found.
*/
static inline struct libmnt_fs *nilfs_find_rw_mount(struct libmnt_context *cxt,
struct libmnt_table *mtab)
{
return nilfs_find_mount(cxt, mtab, NULL, "rw");
}
static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
{
struct libmnt_context *cxt = mi->cxt;