Remove misguided klude around for 2.4.x-test* brokenness. Al Viro

will be removing this stuff from /proc/mounts real soon now I am assured.
 -Erik

5 files changed, 0 insertions, 25 deletions

diff --git a/coreutils/df.c b/coreutils/df.c
index 8d457ec37..ba3227f30 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -103,9 +103,6 @@ extern int df_main(int argc, char **argv)
                 }
 
                 while ((mountEntry = getmntent(mountTable))) {
-                        if (strcmp(mountEntry->mnt_fsname, "none") == 0) {
-                                continue;
-                        }
                         df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
                 }
                 endmntent(mountTable);
diff --git a/df.c b/df.c
index 8d457ec37..ba3227f30 100644
--- a/df.c
+++ b/df.c
@@ -103,9 +103,6 @@ extern int df_main(int argc, char **argv)
                 }
 
                 while ((mountEntry = getmntent(mountTable))) {
-                        if (strcmp(mountEntry->mnt_fsname, "none") == 0) {
-                                continue;
-                        }
                         df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
                 }
                 endmntent(mountTable);
diff --git a/mount.c b/mount.c
index 292be0c43..76f048b1c 100644
--- a/mount.c
+++ b/mount.c
@@ -358,10 +358,6 @@ extern int mount_main(int argc, char **argv)
                         fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
 
                 for( i = 0 ; i < numfilesystems ; i++) {
-                        /* klude around Linux 2.4.x stupidity */
-                        if (strcmp(mntentlist[i].mnt_fsname, "none") == 0) {
-                                continue;
-                        }
                         fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
                                         mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
                                         mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
@@ -384,10 +380,6 @@ extern int mount_main(int argc, char **argv)
 
                         while ((m = getmntent(mountTable)) != 0) {
                                 char *blockDevice = m->mnt_fsname;
-                                /* klude around Linux 2.4.x stupidity */
-                                if (strcmp(blockDevice, "none") == 0) {
-                                        continue;
-                                }
                                 if (strcmp(blockDevice, "/dev/root") == 0) {
                                         find_real_root_device_name( blockDevice);
                                 }
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 292be0c43..76f048b1c 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -358,10 +358,6 @@ extern int mount_main(int argc, char **argv)
                         fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
 
                 for( i = 0 ; i < numfilesystems ; i++) {
-                        /* klude around Linux 2.4.x stupidity */
-                        if (strcmp(mntentlist[i].mnt_fsname, "none") == 0) {
-                                continue;
-                        }
                         fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
                                         mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
                                         mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
@@ -384,10 +380,6 @@ extern int mount_main(int argc, char **argv)
 
                         while ((m = getmntent(mountTable)) != 0) {
                                 char *blockDevice = m->mnt_fsname;
-                                /* klude around Linux 2.4.x stupidity */
-                                if (strcmp(blockDevice, "none") == 0) {
-                                        continue;
-                                }
                                 if (strcmp(blockDevice, "/dev/root") == 0) {
                                         find_real_root_device_name( blockDevice);
                                 }
diff --git a/utility.c b/utility.c
index f3af01f44..afc0e8f8a 100644
--- a/utility.c
+++ b/utility.c
@@ -1199,9 +1199,6 @@ extern struct mntent *findMountPoint(const char *name, const char *table)
                 return 0;
 
         while ((mountEntry = getmntent(mountTable)) != 0) {
-                if (strcmp(mountEntry->mnt_fsname, "none") == 0) {
-                        continue;
-                }
                 if (strcmp(name, mountEntry->mnt_dir) == 0
                         || strcmp(name, mountEntry->mnt_fsname) == 0)   /* String match. */
                         break;