From 5a7d5937f375a14c00496544eec1e0b4a79822c8 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 19 Jun 2014 12:10:23 +1000 Subject: [PATCH] xfsprogs: try to handle mkfs of a file on 4k sector device Try the xfs geometry ioctl if the mkfs target resides in a file; this gives us the equivalent of a device sector size. If this fails, and there's a sector size mismatch between the host FS and the filesystem, then mkfs might fail - but that's no worse than it's been before. Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Reviewed-by: Brian Foster Signed-off-by: Dave Chinner --- libxfs/linux.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libxfs/linux.c b/libxfs/linux.c index 2e07d544d..8d1a11768 100644 --- a/libxfs/linux.c +++ b/libxfs/linux.c @@ -141,10 +141,20 @@ platform_findsizes(char *path, int fd, long long *sz, int *bsz) exit(1); } if ((st.st_mode & S_IFMT) == S_IFREG) { + struct xfs_fsop_geom_v1 geom = { 0 }; + *sz = (long long)(st.st_size >> 9); - *bsz = BBSIZE; - if (BBSIZE > max_block_alignment) - max_block_alignment = BBSIZE; + if (ioctl(fd, XFS_IOC_FSGEOMETRY_V1, &geom) < 0) { + /* + * fall back to BBSIZE; mkfs might fail if there's a + * size mismatch between the image & the host fs... + */ + *bsz = BBSIZE; + } else + *bsz = geom.sectsize; + + if (*bsz > max_block_alignment) + max_block_alignment = *bsz; return; } -- 2.47.2