mount.nfs: When -v is set and the mount succeeds, print the mount info

[nfs-utils.git] / utils / mount / mount.c

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index de94e66f75d5971e6641c308968e003cc6c2a13d..dde4562b045d9f60e4e571ea8a35cf1e914a7ac7 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -171,6 +171,18 @@ static void discover_nfs_mount_data_version(void)
                nfs_mount_data_version = NFS_MOUNT_VERSION;
 }
 
+static void print_one(char *spec, char *node, char *type, char *opts)
+{
+       if (verbose) {
+               printf("%s on %s type %s", spec, node, type);
+
+               if (opts != NULL)
+                       printf(" (%s)", opts);
+
+               printf("\n");
+       }
+}
+
 /* Try to build a canonical options string.  */
 static char * fix_opts_string (int flags, const char *extra_opts) {
        const struct opt_map *om;
@@ -250,11 +262,6 @@ fail_unlock:
        return result;
 }
 
-int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data)
-{
-       return mount(spec, node, type, flags, data);
-}
-
 void mount_usage()
 {
        printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n",
@@ -473,25 +480,15 @@ int main(int argc, char *argv[])
                exit(EX_FAIL);
 
        if (strcmp(fs_type, "nfs4") == 0)
-               mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
+               mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake);
        else
-               mnt_err = nfsmount(spec, mount_point, &flags,
-                                  &extra_opts, &mount_opts,
-                                  0, fake);
+               mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake);
 
        if (mnt_err)
                exit(EX_FAIL);
 
-       if (!fake) {
-               mnt_err = do_mount_syscall(spec, mount_point, fs_type,
-                                          flags & ~(MS_USER|MS_USERS) ,
-                                          mount_opts);
-
-               if (mnt_err) {
-                       mount_error(spec, mount_point, errno);
-                       exit(EX_FAIL);
-               }
-       }
+       if (!fake)
+               print_one(spec, mount_point, fs_type, mount_opts);
 
        if (!nomtab)
                mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts,