From c70d9d768bbe291ad29f29200340d1f4d8bbf30f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 2 Jan 2012 15:00:27 +0100 Subject: libmount: consolidate MNT_FS_* code Signed-off-by: Karel Zak --- libmount/src/fs.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) (limited to 'libmount/src/fs.c') diff --git a/libmount/src/fs.c b/libmount/src/fs.c index 90f484bec..43faa0511 100644 --- a/libmount/src/fs.c +++ b/libmount/src/fs.c @@ -437,20 +437,11 @@ int mnt_fs_set_target(struct libmnt_fs *fs, const char *target) return 0; } -int __mnt_fs_get_flags(struct libmnt_fs *fs) +static int mnt_fs_get_flags(struct libmnt_fs *fs) { return fs ? fs->flags : 0; } -int __mnt_fs_set_flags(struct libmnt_fs *fs, int flags) -{ - if (fs) { - fs->flags = flags; - return 0; - } - return -EINVAL; -} - /** * mnt_fs_is_kernel: * @fs: filesystem @@ -459,7 +450,40 @@ int __mnt_fs_set_flags(struct libmnt_fs *fs, int flags) */ int mnt_fs_is_kernel(struct libmnt_fs *fs) { - return __mnt_fs_get_flags(fs) & MNT_FS_KERNEL; + return mnt_fs_get_flags(fs) & MNT_FS_KERNEL; +} + +/** + * mnt_fs_is_swaparea: + * @fs: filesystem + * + * Returns: 1 if the filesystem uses "swap" as a type + */ +int mnt_fs_is_swaparea(struct libmnt_fs *fs) +{ + return mnt_fs_get_flags(fs) & MNT_FS_SWAP; +} + +/** + * mnt_fs_is_pseudofs: + * @fs: filesystem + * + * Returns: 1 if the filesystem is a pseudo fs type (proc, cgroups) + */ +int mnt_fs_is_pseudo(struct libmnt_fs *fs) +{ + return mnt_fs_get_flags(fs) & MNT_FS_PSEUDO; +} + +/** + * mnt_fs_is_netfs: + * @fs: filesystem + * + * Returns: 1 if the filesystem is a network filesystem + */ +int mnt_fs_is_netfs(struct libmnt_fs *fs) +{ + return mnt_fs_get_flags(fs) & MNT_FS_NET; } /** -- cgit v1.2.3-55-g7522