From: Russ Allbery <rra@debian.org>
Date: Sat, 4 Apr 2009 17:48:18 +0000 (-0700)
Subject: Imported Upstream version 1.4.10+dfsg1
X-Git-Tag: upstream/1.4.10+dfsg1~1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=90093d66f3c87acefa8d32dd535eee371af2e595;p=packages%2Fo%2Fopenafs.git

Imported Upstream version 1.4.10+dfsg1
---

diff --git a/configure b/configure
index c74a64fbd..afa957a98 100755
--- a/configure
+++ b/configure
@@ -15413,7 +15413,7 @@ echo $ECHO_N "checking if key_alloc() takes a struct task *... $ECHO_C" >&6; }
 else
 
     save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror"
+    CPPFLAGS="$CPPFLAGS -Werror -Wno-pointer-arith"
 
   if test $AFS_SYSKVERS -ge 26 ; then
       rm -fr conftest.dir
@@ -15546,7 +15546,7 @@ echo $ECHO_N "checking if key_alloc() takes credentials... $ECHO_C" >&6; }
 else
 
     save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror"
+    CPPFLAGS="$CPPFLAGS -Werror -Wno-pointer-arith"
 
   if test $AFS_SYSKVERS -ge 26 ; then
       rm -fr conftest.dir
diff --git a/configure-libafs b/configure-libafs
index b8a008807..71a9b74ef 100755
--- a/configure-libafs
+++ b/configure-libafs
@@ -15364,7 +15364,7 @@ echo $ECHO_N "checking if key_alloc() takes a struct task *... $ECHO_C" >&6; }
 else
 
     save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror"
+    CPPFLAGS="$CPPFLAGS -Werror -Wno-pointer-arith"
 
   if test $AFS_SYSKVERS -ge 26 ; then
       rm -fr conftest.dir
@@ -15497,7 +15497,7 @@ echo $ECHO_N "checking if key_alloc() takes credentials... $ECHO_C" >&6; }
 else
 
     save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror"
+    CPPFLAGS="$CPPFLAGS -Werror -Wno-pointer-arith"
 
   if test $AFS_SYSKVERS -ge 26 ; then
       rm -fr conftest.dir
diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index a7e732dd4..99e0672bd 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -45,6 +45,10 @@ RCSID
 #define pageoff(pp) pp->offset
 #endif
 
+#ifndef MAX_ERRNO
+#define MAX_ERRNO 1000L
+#endif
+
 #if defined(AFS_LINUX26_ENV)
 #define UnlockPage(pp) unlock_page(pp)
 extern struct backing_dev_info afs_backing_dev_info;
@@ -1087,7 +1091,7 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
     if (code == ENOENT)
 	return ERR_PTR(0);
-    else if ((code >= 0) && (code <= MAX_ERRNO))
+    else if ((code > 0) && (code <= MAX_ERRNO))
 	return ERR_PTR(-code);
     else 
 	return ERR_PTR(-EIO);
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index b8093a1b9..e7b91dcdc 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -773,7 +773,7 @@ AC_DEFUN([LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK], [
   AC_MSG_CHECKING([if key_alloc() takes a struct task *])
   AC_CACHE_VAL([ac_cv_key_alloc_needs_struct_task], [
     save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror"
+    CPPFLAGS="$CPPFLAGS -Werror -Wno-pointer-arith"
     AC_TRY_KBUILD(
 [#include <linux/rwsem.h>
 #include <linux/key.h>
@@ -792,7 +792,7 @@ AC_DEFUN([LINUX_KEY_ALLOC_NEEDS_CRED], [
   AC_MSG_CHECKING([if key_alloc() takes credentials])
   AC_CACHE_VAL([ac_cv_key_alloc_needs_cred], [
     save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror"
+    CPPFLAGS="$CPPFLAGS -Werror -Wno-pointer-arith"
     AC_TRY_KBUILD(
 [#include <linux/rwsem.h>
 #include <linux/key.h>