umount.nfs: Fix white space damage in nfsumount.c
authorChuck Lever <chuck.lever@oracle.com>
Mon, 24 Sep 2007 15:29:20 +0000 (11:29 -0400)
committerNeil Brown <neilb@suse.de>
Tue, 25 Sep 2007 01:50:16 +0000 (11:50 +1000)
Replace leading blanks with tabs in del_mtab().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
utils/mount/nfsumount.c

index ca9c801..ffbda63 100644 (file)
@@ -55,68 +55,68 @@ static int del_mtab(const char *spec, const char *node)
 {
        int umnt_err, res;
 
-        umnt_err = 0;
-        if (lazy) {
-                res = umount2 (node, MNT_DETACH);
-                if (res < 0)
-                        umnt_err = errno;
-                goto writemtab;
-        }
-
-        if (force) {
-                res = umount2 (node, MNT_FORCE);
-                if (res == -1) {
-                        int errsv = errno;
-                        perror(_("umount2"));
-                        errno = errsv;
-                        if (errno == ENOSYS) {
-                                if (verbose)
-                                        printf(_("no umount2, trying umount...\n"));
-                                res = umount (node);
-                        }
-                }
-        } else
-                res = umount (node);
-
-        if (res < 0 && remount && errno == EBUSY && spec) {
-                /* Umount failed - let us try a remount */
-                res = mount(spec, node, NULL,
-                            MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
-                if (res == 0) {
-                        struct mntent remnt;
-                        nfs_error(_("%s: %s busy - remounted read-only"),
-                                       progname, spec);
-                        remnt.mnt_type = remnt.mnt_fsname = NULL;
-                        remnt.mnt_dir = xstrdup(node);
-                        remnt.mnt_opts = xstrdup("ro");
-                        if (!nomtab)
-                                update_mtab(node, &remnt);
-                        return 0;
-                } else if (errno != EBUSY) {    /* hmm ... */
-                        perror(_("remount"));
-                        nfs_error(_("%s: could not remount %s read-only"),
-                                       progname, spec);
-                }
-        }
-
-        if (res >= 0) {
-                /* Umount succeeded */
-                if (verbose)
-                        printf(_("%s umounted\n"), spec ? spec : node);
-        }
+       umnt_err = 0;
+       if (lazy) {
+               res = umount2 (node, MNT_DETACH);
+               if (res < 0)
+                       umnt_err = errno;
+               goto writemtab;
+       }
+
+       if (force) {
+               res = umount2 (node, MNT_FORCE);
+               if (res == -1) {
+                       int errsv = errno;
+                       perror(_("umount2"));
+                       errno = errsv;
+                       if (errno == ENOSYS) {
+                               if (verbose)
+                                       printf(_("no umount2, trying umount...\n"));
+                               res = umount (node);
+                       }
+               }
+       } else
+               res = umount (node);
+
+       if (res < 0 && remount && errno == EBUSY && spec) {
+               /* Umount failed - let us try a remount */
+               res = mount(spec, node, NULL,
+                           MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
+               if (res == 0) {
+                       struct mntent remnt;
+                       nfs_error(_("%s: %s busy - remounted read-only"),
+                                       progname, spec);
+                       remnt.mnt_type = remnt.mnt_fsname = NULL;
+                       remnt.mnt_dir = xstrdup(node);
+                       remnt.mnt_opts = xstrdup("ro");
+                       if (!nomtab)
+                               update_mtab(node, &remnt);
+                       return 0;
+               } else if (errno != EBUSY) {    /* hmm ... */
+                       perror(_("remount"));
+                       nfs_error(_("%s: could not remount %s read-only"),
+                                       progname, spec);
+               }
+       }
+
+       if (res >= 0) {
+               /* Umount succeeded */
+               if (verbose)
+                       printf(_("%s umounted\n"), spec ? spec : node);
+       }
 
  writemtab:
-        if (!nomtab &&
-            (umnt_err == 0 || umnt_err == EINVAL || umnt_err == ENOENT)) {
-               update_mtab(node, NULL);
-        }
+       if (!nomtab &&
+           (umnt_err == 0 || umnt_err == EINVAL || umnt_err == ENOENT)) {
+               update_mtab(node, NULL);
+       }
 
-        if (res >= 0)
-                return 0;
+       if (res >= 0)
+               return 0;
 
-        if (umnt_err)
-                umount_error(umnt_err, node);
-        return EX_FILEIO;
+       if (umnt_err)
+               umount_error(umnt_err, node);
+       return EX_FILEIO;
 }
 
 /*