From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 23 Apr 2024 14:05:09 +0000 (+0800)
Subject: mount-setup: use mount_verbose_full where appropriate
X-Git-Tag: v256-rc1~37^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21f8e749a18d71f4f28a1fe949244f639fb6f776;p=thirdparty%2Fsystemd.git

mount-setup: use mount_verbose_full where appropriate
---

diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index 56381bc7d87..6511d48a909 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -195,10 +195,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
                   p->type,
                   strna(p->options));
 
-        if (FLAGS_SET(p->mode, MNT_FOLLOW_SYMLINK))
-                r = mount_follow_verbose(priority, p->what, p->where, p->type, p->flags, p->options);
-        else
-                r = mount_nofollow_verbose(priority, p->what, p->where, p->type, p->flags, p->options);
+        r = mount_verbose_full(priority, p->what, p->where, p->type, p->flags, p->options, FLAGS_SET(p->mode, MNT_FOLLOW_SYMLINK));
         if (r < 0)
                 return FLAGS_SET(p->mode, MNT_FATAL) ? r : 0;