From 199619791de9270b51f5cdd55d53b5996fce4140 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 14 Nov 2014 20:01:00 +0400 Subject: [PATCH] mnt: Factor out find-mount-by-s_dev code And move the 2nd piece lower to avoid fwd declaration and keep similar calls close to each other. Signed-off-by: Pavel Emelyanov --- mount.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mount.c b/mount.c index 898531332..8d5ba8a82 100644 --- a/mount.c +++ b/mount.c @@ -125,18 +125,6 @@ static inline int fsroot_mounted(struct mount_info *mi) return is_root(mi->root); } -static int __open_mountpoint(struct mount_info *pm, int mnt_fd); -int open_mount(unsigned int s_dev) -{ - struct mount_info *i; - - for (i = mntinfo; i != NULL; i = i->next) - if (s_dev == i->s_dev) - return __open_mountpoint(i, -1); - - return -ENOENT; -} - static struct mount_info *__lookup_mnt_id(struct mount_info *list, int id) { struct mount_info *m; @@ -772,6 +760,17 @@ err: return -1; } +int open_mount(unsigned int s_dev) +{ + struct mount_info *m; + + m = lookup_mnt_sdev(s_dev); + if (!m) + return -ENOENT; + + return __open_mountpoint(m, -1); +} + static int open_mountpoint(struct mount_info *pm) { int fd = -1, ns_old = -1;