df: prioritize mounts nearer the device root

In the presence of bind mounts of a device, the 4th "mount root" field
from /proc/self/mountinfo is now considered, so as to prefer mount
points closer to the root of the device.  Note on older systems with
an /etc/mtab file, the source device was listed as the originating
directory, and so this was not an issue.
Details at http://pad.lv/1432871

* src/df.c (filter_mount_list): When deduplicating mount entries,
only prefer sources nearer or at the root of the device, when the
target is nearer the root of the device.
* NEWS: Mention the change in behavior.
This commit is contained in:
Dave Chiluk authored and Pádraig Brady committed 2015-09-23 01:02:44 +01:00
1 parent 982c79fa14
commit 3babaf8387
2 files changed
+12 -3

No files matched your search

+3
View File
@@ -17,6 +17,9 @@ GNU coreutils NEWS -*- outline -*-
base64 no longer supports hex or oct --wrap parameters,
thus better supporting decimals with leading zeros.
df now prefers sources towards the root of a device when
eliding duplicate bind mounted entries.
** Improvements
du no longer stats all mount points at startup, only doing so
+9 -3
View File
@@ -641,6 +641,13 @@ filter_mount_list (bool devices_only)
if (devlist)
{
bool target_nearer_root = strlen (devlist->me->me_mountdir)
> strlen (me->me_mountdir);
/* With bind mounts, prefer items nearer the root of the source */
bool source_below_root = devlist->me->me_mntroot != NULL
&& me->me_mntroot != NULL
&& (strlen (devlist->me->me_mntroot)
< strlen (me->me_mntroot));
if (! print_grand_total && me->me_remote && devlist->me->me_remote
&& ! STREQ (devlist->me->me_devname, me->me_devname))
{
@@ -652,9 +659,8 @@ filter_mount_list (bool devices_only)
else if ((strchr (me->me_devname, '/')
/* let "real" devices with '/' in the name win. */
&& ! strchr (devlist->me->me_devname, '/'))
/* let a shorter mountdir win. */
|| (strlen (devlist->me->me_mountdir)
> strlen (me->me_mountdir))
/* let points towards the root of the device win. */
|| (target_nearer_root && ! source_below_root)
/* let an entry overmounted on a new device win... */
|| (! STREQ (devlist->me->me_devname, me->me_devname)
/* ... but only when matching an existing mnt point,