From c056da60dd5914342efeb2f494f4f2e9be6a8fe4 Mon Sep 17 00:00:00 2001 From: Luk Claes Date: Fri, 25 May 2012 19:21:00 +0200 Subject: [PATCH] New upstream version * New upstream version - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream. --- debian/changelog | 7 +++++++ debian/patches/18-dont-use-PAGE_SIZE.patch | 20 -------------------- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/18-dont-use-PAGE_SIZE.patch diff --git a/debian/changelog b/debian/changelog index d69c7a1..8c674bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low + + * New upstream version + - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream. + + -- Luk Claes Fri, 25 May 2012 19:16:54 +0200 + nfs-utils (1:1.2.5-4) unstable; urgency=low * Add libmount-dev to Build-Depends and explicitly enable it. diff --git a/debian/patches/18-dont-use-PAGE_SIZE.patch b/debian/patches/18-dont-use-PAGE_SIZE.patch deleted file mode 100644 index a2113e6..0000000 --- a/debian/patches/18-dont-use-PAGE_SIZE.patch +++ /dev/null @@ -1,20 +0,0 @@ -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); - -- 2.39.2