From 25a2c948b24163ce0e0e9e52f6a5fef33d7d7842 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Thu, 29 May 2014 15:30:46 +0100 Subject: df: use the last device name provided by the system The device name reported for a particular mount entry may no longer be valid if the mount point was subsequently mounted on a different device. Therefore honor the order of the mount list returned by the system and use the last reported device name. * src/df.c (filter_mount_list): When discarding the current mount entry, ensure that a new device name is not also discarded. * tests/df/skip-duplicates.sh: Add a test case. Also fix a false failure in the edge case of a system with only a single file system. * NEWS: Mention the fix. --- src/df.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/df.c b/src/df.c index 01ecca6c5..82b0c5f37 100644 --- a/src/df.c +++ b/src/df.c @@ -604,7 +604,7 @@ excluded_fstype (const char *fstype) } /* Filter mount list by skipping duplicate entries. - In the case of duplicities - based on to the device number - the mount entry + In the case of duplicities - based on the device number - the mount entry with a '/' in its me_devname (i.e. not pseudo name like tmpfs) wins. If both have a real devname (e.g. bind mounts), then that with the shorter me_mountdir wins. */ @@ -638,17 +638,33 @@ filter_mount_list (void) if (devlist) { - discard_me = me; - /* ...let the shorter mountdir win. */ if ((strchr (me->me_devname, '/') && ! strchr (devlist->me->me_devname, '/')) || (strlen (devlist->me->me_mountdir) > strlen (me->me_mountdir))) { + /* Discard mount entry for existing device. */ discard_me = devlist->me; devlist->me = me; } + else + { + /* Discard mount entry currently being processed. */ + discard_me = me; + + /* We might still want the devname from this mount entry as + the dev_num might not correlate with st_dev if another + device is subsequently overmounted at mountdir, so honor + the order of the presented list and replace with the + latest devname encountered. */ + if (! STREQ (devlist->me->me_devname, me->me_devname)) + { + free (devlist->me->me_devname); + devlist->me->me_devname = xstrdup (me->me_devname); + } + } + } } -- cgit v1.2.3-70-g09d2