[gentoo-commits] gentoo-x86 commit in sys-fs/e2fsprogs/files: e2fsprogs-1.42-no-fallocate.patch

[Mike Frysinger (vapier)]

vapier      12/03/05 05:40:58

  Added:                e2fsprogs-1.42-no-fallocate.patch
  Log:
  Fix building on older glibcs w/out fallocate #406609 by Ortwin Glueck.
  
  (Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch?rev=1.1&content-type=text/plain

Index: e2fsprogs-1.42-no-fallocate.patch
===================================================================
https://bugs.gentoo.org/406609

From 1a36d2ead2f45a21f74ccc332a534c1b788d6029 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 5 Mar 2012 00:35:21 -0500
Subject: [PATCH] libext2fs: check for fallocate symbol before using it

If we have newer kernel headers which define FALLOC_FL_PUNCH_HOLE, but we
are on an older glibc which lacks fallocate, we end up trying to use the
func anyways.  Check the ifdef that autoconf already set up for us.

Reported-by: Ortwin Glueck <odi@×××.ch>
Signed-off-by: Mike Frysinger <vapier@g.o>
---
 lib/ext2fs/unix_io.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
index 9f0613a..da3f8fd 100644
--- a/lib/ext2fs/unix_io.c
+++ b/lib/ext2fs/unix_io.c
@@ -905,7 +905,7 @@ static errcode_t unix_discard(io_channel channel, unsigned long long block,
 		goto unimplemented;
 #endif
 	} else {
-#ifdef FALLOC_FL_PUNCH_HOLE
+#if defined(HAVE_FALLOCATE) && defined(FALLOC_FL_PUNCH_HOLE)
 		/*
 		 * If we are not on block device, try to use punch hole
 		 * to reclaim free space.
-- 
1.7.8.4