From fb10fd960b3c81a3f09993ae84626fbee018a33f Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 19 Jan 2010 10:52:44 -0600 Subject: [PATCH] mkfs: don't warn about topology when mkfsing a file Some tests were failing for me like: QA output created by 206 === truncate file === === mkfs.xfs === +warning: unable to probe device toplology for device /mnt/test/fsfile.21615 ... I thought about filtering the tests, but ... It seems that we shouldn't even be trying to get topology for a plain file, should we? And then we won't warn about failure. Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner Signed-off-by: Christoph Hellwig --- mkfs/xfs_mkfs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 689425dfa..b672b7a4d 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -356,6 +356,11 @@ static void blkid_get_topology(const char *device, int *sunit, int *swidth, int blkid_topology tp; blkid_probe pr; unsigned long val; + struct stat statbuf; + + /* can't get topology info from a file */ + if (!stat(device, &statbuf) && S_ISREG(statbuf.st_mode)) + return; pr = blkid_new_probe_from_filename(device); if (!pr) -- 2.47.2