From: Ilya Dryomov <ilya.dryomov@inktank.com>
Date: Thu, 1 May 2014 12:08:03 +0000 (+0400)
Subject: test_librbd_fsx: make resizes sector-size aligned
X-Git-Tag: v0.81~48^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d63808ed09412c947d1242f0abded6e267bb8e50;p=ceph.git

test_librbd_fsx: make resizes sector-size aligned

In preparation for krbd mode support, change check_trunc_hack() to
resize to a sector-size aligned value.  The kernel will not work with
images whose size is not sector-size aligned.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
---

diff --git a/src/test/librbd/fsx.c b/src/test/librbd/fsx.c
index f5a76939fca4..e4774e08a621 100644
--- a/src/test/librbd/fsx.c
+++ b/src/test/librbd/fsx.c
@@ -464,20 +464,21 @@ check_size(void)
 	}
 }
 
+#define TRUNC_HACK_SIZE	(200ULL << 9)	/* 512-byte aligned for krbd */
 
 void
 check_trunc_hack(void)
 {
 	rbd_image_info_t statbuf;
 
-	rbd_resize(image, (off_t)0);
-	rbd_resize(image, (off_t)100000);
+	rbd_resize(image, 0ULL);
+	rbd_resize(image, TRUNC_HACK_SIZE);
 	rbd_stat(image, &statbuf, sizeof(statbuf));
-	if (statbuf.size != (off_t)100000) {
+	if (statbuf.size != TRUNC_HACK_SIZE) {
  		prt("no extend on truncate! not posix!\n");
  		exit(130);
  	}
-	rbd_resize(image, (off_t)0);
+	rbd_resize(image, 0ULL);
 }
 
 int