From: Darrick J. Wong <djwong@xxxxxxxxxx>
If parent pointers are available, use them to supply file paths when
doing things to files, instead of merely printing the inode number.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
---
scrub/common.c | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
diff --git a/scrub/common.c b/scrub/common.c
index aca596487..f86546556 100644
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -9,6 +9,7 @@
#include <syslog.h>
#include "platform_defs.h"
#include "libfrog/paths.h"
+#include "libfrog/getparents.h"
#include "xfs_scrub.h"
#include "common.h"
#include "progress.h"
@@ -405,19 +406,55 @@ scrub_render_ino_descr(
...)
{
va_list args;
+ size_t pathlen = 0;
uint32_t agno;
uint32_t agino;
int ret;
+ if (ctx->mnt.fsgeom.flags & XFS_FSOP_GEOM_FLAGS_PARENT) {
+ struct xfs_handle handle;
+
+ memcpy(&handle.ha_fsid, ctx->fshandle, sizeof(handle.ha_fsid));
+ handle.ha_fid.fid_len = sizeof(xfs_fid_t) -
+ sizeof(handle.ha_fid.fid_len);
+ handle.ha_fid.fid_pad = 0;
+ handle.ha_fid.fid_ino = ino;
+ handle.ha_fid.fid_gen = gen;
+
+ ret = handle_to_path(&handle, sizeof(struct xfs_handle), 4096,
+ buf, buflen);
+ if (ret)
+ goto report_inum;
+
+ /*
+ * Leave at least 16 bytes for the description of what went
+ * wrong. If we can't do that, we'll use the inode number.
+ */
+ pathlen = strlen(buf);
+ if (pathlen >= buflen - 16)
+ goto report_inum;
+
+ if (format) {
+ buf[pathlen] = ' ';
+ buf[pathlen + 1] = 0;
+ pathlen++;
+ }
+
+ goto report_format;
+ }
+
+report_inum:
agno = cvt_ino_to_agno(&ctx->mnt, ino);
agino = cvt_ino_to_agino(&ctx->mnt, ino);
ret = snprintf(buf, buflen, _("inode %"PRIu64" (%"PRIu32"/%"PRIu32")%s"),
ino, agno, agino, format ? " " : "");
if (ret < 0 || ret >= buflen || format == NULL)
return ret;
+ pathlen = ret;
+report_format:
va_start(args, format);
- ret += vsnprintf(buf + ret, buflen - ret, format, args);
+ pathlen += vsnprintf(buf + pathlen, buflen - pathlen, format, args);
va_end(args);
- return ret;
+ return pathlen;
}
