From: Eric Sandeen <sandeen@sandeen.net>
Date: Wed, 23 Feb 2011 16:28:55 +0000 (-0600)
Subject: xfs_repair: Don't ever try to set the device blocksize
X-Git-Tag: v3.1.5~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29622975322678fc5fa875ed02879e7c37b83b07;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: Don't ever try to set the device blocksize

On 4k devices, we get this warning from repair:

# xfs_repair /dev/sdc2
xfs_repair: warning - cannot set blocksize 512 on block device /dev/sdc2: Invalid argument
Phase 1 - find and verify superblock...
...

but things proceed without trouble after that.

I'm unable to find any history or reason for setting the
device blocksize at the beginning of repair, and in any case,
things clearly work without doing so.  So, let's just remove it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Alex Elder <aelder@sgi.com>
---

diff --git a/repair/init.c b/repair/init.c
index 654c406f0..bc10cc483 100644
--- a/repair/init.c
+++ b/repair/init.c
@@ -143,7 +143,7 @@ xfs_init(libxfs_init_t *args)
 	}
 
 	args->usebuflock = do_prefetch;
-	args->setblksize = !dangerously;
+	args->setblksize = 0;
 	args->isdirect = LIBXFS_DIRECT;
 	if (no_modify)
 		args->isreadonly = (LIBXFS_ISREADONLY | LIBXFS_ISINACTIVE);