From 6c6eb219d5cdecaf550e4e0825980dff9ed696a7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 14 Dec 2022 14:58:48 +0900 Subject: [PATCH] mount-util: mount flag is unsigned long --- src/shared/mount-util.c | 6 +++--- src/shared/mount-util.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c index f63230fd006..7817ebc0128 100644 --- a/src/shared/mount-util.c +++ b/src/shared/mount-util.c @@ -439,7 +439,7 @@ static const char *const mount_attr_propagation_type_table[_MOUNT_ATTR_PROPAGATI DEFINE_STRING_TABLE_LOOKUP(mount_attr_propagation_type, MountAttrPropagationType); -unsigned int mount_attr_propagation_type_to_flag(MountAttrPropagationType t) { +static unsigned long mount_attr_propagation_type_to_flag(MountAttrPropagationType t) { switch (t) { case MOUNT_ATTR_PROPAGATION_INHERIT: return 0; @@ -498,9 +498,9 @@ static int mount_switch_root_move(const char *path) { } int mount_switch_root(const char *path, MountAttrPropagationType type) { - int r; _cleanup_close_ int fd_newroot = -EBADF; - unsigned int flags; + unsigned long flags; + int r; assert(path); diff --git a/src/shared/mount-util.h b/src/shared/mount-util.h index f6de42e1a02..bc28063d613 100644 --- a/src/shared/mount-util.h +++ b/src/shared/mount-util.h @@ -23,7 +23,6 @@ typedef enum MountAttrPropagationType { const char* mount_attr_propagation_type_to_string(MountAttrPropagationType t) _const_; MountAttrPropagationType mount_attr_propagation_type_from_string(const char *s) _pure_; -unsigned int mount_attr_propagation_type_to_flag(MountAttrPropagationType t); int repeat_unmount(const char *path, int flags); int umount_recursive(const char *target, int flags); -- 2.47.3