Tito, farmatito at tiscali dot it writes:

Hi to all,
This patch is useful for:
1) remove an unused var from extern char *find_real_root_device_name(const char* name)
    changing it to extern char *find_real_root_device_name(void).
2) fixes include/libbb.h, coreutils/df.c, util-linux/mount.c and  util-linux/umount.c accordingly.
3) fixes a bug, really a false positive,  in find_real_root_device_name() that happens if
    in the /dev directory exists a link named root (/dev/root) that should be skipped but
    is not. This affects applets like df that display wrong results


git-svn-id: svn://busybox.net/trunk/busybox@9056 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 2 insertions, 2 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 0bc46ecb5..b059d7094 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -345,7 +345,7 @@ static void show_mounts(char *onlytype)
                         if (strcmp(blockDevice, "rootfs") == 0) {
                                 continue;
                         } else if (strcmp(blockDevice, "/dev/root") == 0) {
-                                blockDevice = find_real_root_device_name(blockDevice);
+                                blockDevice = find_real_root_device_name();
                         }
                         if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) {
                                 printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 37a8f061e..21c2e6e4d 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -115,7 +115,7 @@ static char *mtab_getinfo(const char *match, const char which)
                                 } else if (strcmp(cur->device, "/dev/root") == 0) {
                                         /* Adjusts device to be the real root device,
                                          * or leaves device alone if it can't find it */
-                                        cur->device = find_real_root_device_name(cur->device);
+                                        cur->device = find_real_root_device_name();
                                 }
 #endif
                                 return cur->device;