From 9c7085f484dba1e14f47fc05e249c18922b8db5d Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 17 Feb 2021 15:46:31 -0600 Subject: Teach df /dev/node to reliably show rdev even when devtmpfs is mounted more recently than the resulting mount point. --- toys/posix/df.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/toys/posix/df.c b/toys/posix/df.c index 0201315e..c8f492ea 100644 --- a/toys/posix/df.c +++ b/toys/posix/df.c @@ -160,11 +160,11 @@ void df_main(void) } else { // Find and display this filesystem. Use _last_ hit in case of // overmounts (which is first hit in the reversed list). - for (mt = mtend; mt; mt = mt->prev) - if (st.st_dev == mt->stat.st_dev - || (st.st_rdev && (st.st_rdev == mt->stat.st_dev))) - break; - show_mt(mt, measuring); + for (mt = mtend, mt2 = 0; mt; mt = mt->prev) { + if (!mt2 && st.st_dev == mt->stat.st_dev) mt2 = mt; + if (st.st_rdev && (st.st_rdev == mt->stat.st_dev)) break; + } + show_mt(mt ? : mt2, measuring); } } if (!measuring--) break; -- cgit v1.2.3