From a5d34ab7e9905961f27daf161bb135df217ddf4a Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 23 Jun 2015 11:37:38 +1000 Subject: [PATCH] xfs_repair: automatically enable -f (file) mode when needed If we specify "-f" to xfs_repair, it recognizes that it's working on a file, and if the underlying filesystem sector size differs such that direct IO won't work, it disables direct IO. It's odd, though, that we'd need to specify this, and the failure is non-obvious: # xfs_repair /mnt/test/foo.img Phase 1 - find and verify superblock... xfs_repair: read failed: Invalid argument I see no advantage to requiring the administrator to jump through this hoop; why not just detect that it's a file, and move on? Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- repair/xfs_repair.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index 11a6069ac..8cb06b35a 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -573,6 +573,18 @@ main(int argc, char **argv) exit(1); } + /* -f forces this, but let's be nice and autodetect it, as well. */ + if (!isa_file) { + int fd = libxfs_device_to_fd(x.ddev); + struct stat64 statbuf; + + if (fstat64(fd, &statbuf) < 0) + do_warn(_("%s: couldn't stat \"%s\"\n"), + progname, fs_name); + else if (S_ISREG(statbuf.st_mode)) + isa_file = 1; + } + /* * if the sector size of the filesystem we are trying to repair is * smaller than that of the underlying filesystem (i.e. we are repairing -- 2.47.2