From: Luk Claes <luk@debian.org>
Date: Sun, 2 Oct 2011 20:22:45 +0000 (+0200)
Subject: debian/patches/18-dont-use-PAGE_SIZE.patch
X-Git-Tag: debian/1%1.2.5-2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=32869f03ab9be661bf41eecccca8809a8433d70a

debian/patches/18-dont-use-PAGE_SIZE.patch
---

diff --git a/debian/changelog b/debian/changelog
index 3f88f4e..3f823a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nfs-utils (1:1.2.5-2) unstable; urgency=low
+
+  * debian/patches/18-dont-use-PAGE_SIZE.patch
+
+ -- Luk Claes <luk@debian.org>  Sun, 02 Oct 2011 22:21:10 +0200
+
 nfs-utils (1:1.2.5-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/18-dont-use-PAGE_SIZE.patch b/debian/patches/18-dont-use-PAGE_SIZE.patch
new file mode 100644
index 0000000..a2113e6
--- /dev/null
+++ b/debian/patches/18-dont-use-PAGE_SIZE.patch
@@ -0,0 +1,20 @@
+PAGE_SIZE is not exported by all architectures as it is not fixed: it can depend on the model of the machine. So it's better to query the system configuration for the actual page size on the machine.
+
+---
+ utils/blkmapd/device-process.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/utils/blkmapd/device-process.c b/utils/blkmapd/device-process.c
+index 27ff374..652a7a8 100644
+--- a/utils/blkmapd/device-process.c
++++ b/utils/blkmapd/device-process.c
+@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_t *end, struct bl_volume *vols, int voln
+ 		off_t stripe_unit = vol->param.bv_stripe_unit;
+ 		/* Check limitations imposed by device-mapper */
+ 		if ((stripe_unit & (stripe_unit - 1)) != 0
+-		    || stripe_unit < (off_t) (PAGE_SIZE >> 9))
++		    || stripe_unit < (off_t) (sysconf(_SC_PAGE_SIZE) >> 9))
+ 			return -EIO;
+ 		BLK_READBUF(p, end, 4);
+ 		READ32(vol->bv_vol_n);
+
diff --git a/debian/patches/series b/debian/patches/series
index e05755b..14b84c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 11-532048-reduce-verbosity.patch
 16-mount.nfs.man-update-distinction-between-fstype.patch
 17-multiarch-kerberos-paths.patch
+18-dont-use-PAGE_SIZE.patch