From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-45892-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1JXP9o-0000JS-45
	for garchives@archives.gentoo.org; Thu, 06 Mar 2008 23:05:48 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9ACB7E0983;
	Thu,  6 Mar 2008 23:05:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 136A3E0983
	for <gentoo-commits@lists.gentoo.org>; Thu,  6 Mar 2008 23:05:47 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 82AAA66DB6
	for <gentoo-commits@lists.gentoo.org>; Thu,  6 Mar 2008 23:05:46 +0000 (UTC)
Received: from jsbronder by stork.gentoo.org with local (Exim 4.68)
	(envelope-from <jsbronder@gentoo.org>)
	id 1JXP9l-00046J-1N
	for gentoo-commits@lists.gentoo.org; Thu, 06 Mar 2008 23:05:45 +0000
From: "Justin Bronder (jsbronder)" <jsbronder@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, jsbronder@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/pvfs2/files: 2.7.0-ctl_unnumbered.patch pvfs2-server-init.d-2.7.0 pvfs2-client-conf.d-2.7.0 pvfs2-client-init.d-2.7.0 2.7.0-kernel-rt.patch pvfs2-server-conf.d-2.7.0 2.7.0-verbose-checking.patch 2.7.0-gentoo-makefile.patch 2.7.0-kmem_cache.patch
X-VCS-Repository: gentoo-x86
X-VCS-Files: 2.7.0-ctl_unnumbered.patch pvfs2-server-init.d-2.7.0 pvfs2-client-conf.d-2.7.0 pvfs2-client-init.d-2.7.0 2.7.0-kernel-rt.patch pvfs2-server-conf.d-2.7.0 2.7.0-verbose-checking.patch 2.7.0-gentoo-makefile.patch 2.7.0-kmem_cache.patch
X-VCS-Directories: sys-cluster/pvfs2/files
X-VCS-Committer: jsbronder
X-VCS-Committer-Name: Justin Bronder
Content-Type: text/plain; charset=utf8
Message-Id: <E1JXP9l-00046J-1N@stork.gentoo.org>
Sender: Justin Bronder <jsbronder@stork.gentoo.org>
Date: Thu, 06 Mar 2008 23:05:45 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: faab3455-1f5a-477f-a015-9a5d2a64d6f3
X-Archives-Hash: 435a38f9d5c9954c16e6b9630f097e35

jsbronder    08/03/06 23:05:45

  Added:                2.7.0-ctl_unnumbered.patch
                        pvfs2-server-init.d-2.7.0 pvfs2-client-conf.d-2.7=
.0
                        pvfs2-client-init.d-2.7.0 2.7.0-kernel-rt.patch
                        pvfs2-server-conf.d-2.7.0
                        2.7.0-verbose-checking.patch
                        2.7.0-gentoo-makefile.patch 2.7.0-kmem_cache.patc=
h
  Log:
  Fix bug #210923.  Support kernel 2.6.24.  Cleanup ebuild.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  sys-cluster/pvfs2/files/2.7.0-ctl_unnumbered.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-ctl_unnumbered.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-ctl_unnumbered.patch?rev=3D1.1&content-type=3Dtext/plain

Index: 2.7.0-ctl_unnumbered.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Index: src/kernel/linux-2.6/pvfs2-proc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-proc.c,v
diff -u -r1.8 -r1.9
--- src/kernel/linux-2.6/pvfs2-proc.c	19 Aug 2007 18:20:28 -0000	1.8
+++ src/kernel/linux-2.6/pvfs2-proc.c	11 Jan 2008 15:20:16 -0000	1.9
@@ -261,10 +261,19 @@
 static int min_debug[] =3D {0}, max_debug[] =3D {GOSSIP_MAX_DEBUG};
 static int min_op_timeout_secs[] =3D {0}, max_op_timeout_secs[] =3D {INT=
_MAX};
=20
+/*
+ * Modern kernels prefer to number the controls themselves.
+ */
+#ifdef CTL_UNNUMBERED
+#define UNNUMBERED_OR_VAL(x) CTL_UNNUMBERED
+#else
+#define UNNUMBERED_OR_VAL(x) x
+#endif
+
 static ctl_table pvfs2_acache_table[] =3D {
     /* controls acache timeout */
     {
-        .ctl_name =3D 1,
+        .ctl_name =3D UNNUMBERED_OR_VAL(1),
         .procname =3D "timeout-msecs",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -273,7 +282,7 @@
     },
     /* controls acache hard limit */
     {
-        .ctl_name =3D 2,
+        .ctl_name =3D UNNUMBERED_OR_VAL(2),
         .procname =3D "hard-limit",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -282,7 +291,7 @@
     },
     /* controls acache soft limit */
     {
-        .ctl_name =3D 3,
+        .ctl_name =3D UNNUMBERED_OR_VAL(3),
         .procname =3D "soft-limit",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -291,7 +300,7 @@
     },
     /* controls acache reclaim percentage */
     {
-        .ctl_name =3D 4,
+        .ctl_name =3D UNNUMBERED_OR_VAL(4),
         .procname =3D "reclaim-percentage",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -303,7 +312,7 @@
 static ctl_table pvfs2_ncache_table[] =3D {
     /* controls ncache timeout */
     {
-        .ctl_name =3D 1,
+        .ctl_name =3D UNNUMBERED_OR_VAL(1),
         .procname =3D "timeout-msecs",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -312,7 +321,7 @@
     },
     /* controls ncache hard limit */
     {
-        .ctl_name =3D 2,
+        .ctl_name =3D UNNUMBERED_OR_VAL(2),
         .procname =3D "hard-limit",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -321,7 +330,7 @@
     },
     /* controls ncache soft limit */
     {
-        .ctl_name =3D 3,
+        .ctl_name =3D UNNUMBERED_OR_VAL(3),
         .procname =3D "soft-limit",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -330,7 +339,7 @@
     },
     /* controls ncache reclaim percentage */
     {
-        .ctl_name =3D 4,
+        .ctl_name =3D UNNUMBERED_OR_VAL(4),
         .procname =3D "reclaim-percentage",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -343,15 +352,15 @@
 static int ncache_perf_count =3D PVFS2_PERF_COUNT_REQUEST_NCACHE;
 static ctl_table pvfs2_pc_table[] =3D {
     {
-        .ctl_name =3D 1,
+        .ctl_name =3D UNNUMBERED_OR_VAL(1),
         .procname =3D "acache",
         .maxlen =3D 4096,
         .mode =3D 0444,
         .proc_handler =3D pvfs2_pc_proc_handler,
         .extra1 =3D &acache_perf_count,
     },
     {
-        .ctl_name =3D 2,
+        .ctl_name =3D UNNUMBERED_OR_VAL(2),
         .procname =3D "ncache",
         .maxlen =3D 4096,
         .mode =3D 0444,
@@ -366,44 +375,44 @@
 static ctl_table pvfs2_stats_table[] =3D {
     /* shows number of hits in cache */
     {
-        .ctl_name =3D 1,
+        .ctl_name =3D UNNUMBERED_OR_VAL(1),
         .procname =3D "hits",
         .data     =3D &g_pvfs2_stats.cache_hits,
         .maxlen   =3D sizeof(unsigned long),
         .mode     =3D 0444,
         .proc_handler =3D &proc_dointvec,
     },
     {
-        .ctl_name =3D 2,
+        .ctl_name =3D UNNUMBERED_OR_VAL(2),
         .procname =3D "misses",
         .data     =3D &g_pvfs2_stats.cache_misses,
         .maxlen   =3D sizeof(unsigned long),
         .mode     =3D 0444,
         .proc_handler =3D &proc_dointvec,
     },
     {
-        .ctl_name =3D 3,
+        .ctl_name =3D UNNUMBERED_OR_VAL(3),
         .procname =3D "reads",
         .data     =3D &g_pvfs2_stats.reads,
         .maxlen   =3D sizeof(unsigned long),
         .mode     =3D 0444,
         .proc_handler =3D &proc_dointvec,
     },
     {
-        .ctl_name =3D 4,
+        .ctl_name =3D UNNUMBERED_OR_VAL(4),
         .procname =3D "writes",
         .data     =3D &g_pvfs2_stats.writes,
         .maxlen   =3D sizeof(unsigned long),
         .mode     =3D 0444,
         .proc_handler =3D &proc_dointvec,
     },
-    {.ctl_name =3D 0},
+    {0}
 };
=20
 static ctl_table pvfs2_table[] =3D {
     /* controls debugging level */
     {
-        .ctl_name =3D 1,
+        .ctl_name =3D UNNUMBERED_OR_VAL(1),
         .procname =3D "debug",
         .data =3D &gossip_debug_mask,
         .maxlen =3D sizeof(int),
@@ -415,7 +424,7 @@
     },
     /* operation timeout */
     {
-        .ctl_name =3D 2,
+        .ctl_name =3D UNNUMBERED_OR_VAL(2),
         .procname =3D "op-timeout-secs",
         .data =3D &op_timeout_secs,
         .maxlen =3D sizeof(int),
@@ -427,7 +436,7 @@
     },
     /* time interval for client side performance counters */
     {
-        .ctl_name =3D 3,
+        .ctl_name =3D UNNUMBERED_OR_VAL(3),
         .procname =3D "perf-time-interval-secs",
         .maxlen =3D sizeof(int),=20
         .mode =3D 0644,
@@ -436,7 +445,7 @@
     },
     /* time interval for client side performance counters */
     {
-        .ctl_name =3D 4,
+        .ctl_name =3D UNNUMBERED_OR_VAL(4),
         .procname =3D "perf-history-size",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -445,7 +454,7 @@
     },
     /* reset performance counters */
     {
-        .ctl_name =3D 5,
+        .ctl_name =3D UNNUMBERED_OR_VAL(5),
         .procname =3D "perf-counter-reset",
         .maxlen =3D sizeof(int),
         .mode =3D 0644,
@@ -454,30 +463,30 @@
     },
     /* subdir for acache control */
     {
-        .ctl_name =3D 6,
+        .ctl_name =3D UNNUMBERED_OR_VAL(6),
         .procname =3D "acache",
         .maxlen =3D 0,
         .mode =3D 0555,
         .child =3D pvfs2_acache_table
     },
     {
-        .ctl_name =3D 7,
+        .ctl_name =3D UNNUMBERED_OR_VAL(7),
         .procname =3D "perf-counters",
         .maxlen =3D 0,
         .mode =3D 0555,
         .child =3D pvfs2_pc_table
     },
     /* subdir for ncache control */
     {
-        .ctl_name =3D 8,
+        .ctl_name =3D UNNUMBERED_OR_VAL(8),
         .procname =3D "ncache",
         .maxlen =3D 0,
         .mode =3D 0555,
         .child =3D pvfs2_ncache_table
     },
     /* statistics maintained by the kernel module (output only below thi=
s) */
     {
-        .ctl_name =3D 9,
+        .ctl_name =3D UNNUMBERED_OR_VAL(9),
         .procname =3D "stats",
         .maxlen =3D 0,
         .mode =3D 0555,
@@ -487,7 +496,7 @@
 };
 static ctl_table fs_table[] =3D {
     {
-        .ctl_name =3D 1,
+        .ctl_name =3D UNNUMBERED_OR_VAL(1),
         .procname =3D "pvfs2",
         .mode =3D 0555,
         .child =3D pvfs2_table



1.1                  sys-cluster/pvfs2/files/pvfs2-server-init.d-2.7.0

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-server-init.d-2.7.0?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-server-init.d-2.7.0?rev=3D1.1&content-type=3Dtext/plain

Index: pvfs2-server-init.d-2.7.0
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server-i=
nit.d-2.7.0,v 1.1 2008/03/06 23:05:44 jsbronder Exp $

depend() {
    after localmount netmount nfsmount dns
    use net
}


checkconfig() {
    local piddir=3D$(dirname "${PVFS2_PIDFILE}")
    if [ ! -d "${piddir}" ]; then
        mkdir -p "${piddir}" || return 1
    fi

    # verify presence of server binary
    if ! [ -x "${PVFS2_SERVER}" ]; then
        eerror "Could not find executable ${PVFS2_SERVER}"
        return 1
    fi

    if ! [ -r "${PVFS2_FS_CONF}" ]; then
        eerror "Could not read ${PVFS2_FS_CONF}"
        return 1
    fi
}

start() {
    local rc
    checkconfig || return 1
   =20
    ebegin "Starting PVFS2 server"
   =20
    # Optionally force pvfs2-server to generate the pvfs2 filesystem.
    if [[ ${PVFS2_AUTO_MKFS} -ne 0 && \
        ! -f $(grep StorageSpace ${PVFS2_FS_CONF} | cut -d' ' -f 2)/colle=
ctions.db ]]; then
        ewarn "Initializing the file system storage with --mkfs"
        "${PVFS2_SERVER}"  --mkfs "${PVFS2_FS_CONF}"
        rc=3D$?
    fi

    if [[ ${rc} -eq 0 ]]; then=20
        start-stop-daemon -b --start  --quiet \
            --pidfile "${PVFS2_PIDFILE}" \
            --exec "${PVFS2_SERVER}" \
            -- -p "${PVFS2_PIDFILE}" ${PVFS2_OPTIONS} "${PVFS2_FS_CONF}"
        rc=3D$?
    fi
    eend ${rc}
}

stop() {
    checkconfig || return 1
    ebegin "Stopping PVFS2 server"
    start-stop-daemon --stop  --quiet --pidfile "${PVFS2_PIDFILE}"
    eend
}

restart() {
    svc_stop
    sleep 2
    svc_start
}



1.1                  sys-cluster/pvfs2/files/pvfs2-client-conf.d-2.7.0

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-client-conf.d-2.7.0?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-client-conf.d-2.7.0?rev=3D1.1&content-type=3Dtext/plain

Index: pvfs2-client-conf.d-2.7.0
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
# Extra arguments to supply to the pvfs2-client daemon
#PVFS2_CLIENT_ARGS=3D"-L /var/log/pvfs2-client.log"

# Location of the pvfs2-client binaries.  Defaults are shown
PVFS2_CLIENT=3D"/usr/sbin/pvfs2-client"
PVFS2_CLIENT_CORE=3D"/usr/sbin/pvfs2-client-core"

# Location to store pid
PVFS2_CLIENT_PIDFILE=3D"/var/run/pvfs2-client.pid"

# List of server:mountpoint to automatically mount when the
# init script is run.  If some other mechanism is used to do
# the mounting, then this can be left commented out.
# 3334 is the default port for pvfs2.
# <host>:<port>,<mount_point>
#PVFS2_MOUNTS=3D"servera.tld:3334,/pvfs serverb.tld:3334,/other/pvfs"





1.1                  sys-cluster/pvfs2/files/pvfs2-client-init.d-2.7.0

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-client-init.d-2.7.0?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-client-init.d-2.7.0?rev=3D1.1&content-type=3Dtext/plain

Index: pvfs2-client-init.d-2.7.0
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client-i=
nit.d-2.7.0,v 1.1 2008/03/06 23:05:44 jsbronder Exp $


depend() {
	need net
	need localmount
	before pbs_mom
	after pvfs2-server
}

checkconfig() {
	if [ ! -x "${PVFS2_CLIENT}" -o ! -x "${PVFS2_CLIENT_CORE}" ]; then
		eend 1 "pvfs-2 was not correctly installed."
		return 1
	fi

	local piddir=3D$(dirname ${PVFS2_CLIENT_PIDFILE})
	if [ ! -d "${piddir}" ]; then
		ewarn "Creating ${piddir}"
		mkdir -p ${piddir} || return 1
	fi
}

start() {
	local rc=3D0
    local server_mp server mp
    checkconfig || return 1
	ebegin "Starting pvfs2-client"

    if ! grep -qs pvfs2 /proc/filesystems; then
        eerror "Kernel does not support pvfs2 filesystems"
        return 1
    fi

    # Don't fork the client so we can get the pid with s-s-d.
	if ! start-stop-daemon --start -m -b --quiet \
        --pidfile ${PVFS2_CLIENT_PIDFILE} \
        --exec "${PVFS2_CLIENT}" \
        -- -f -p ${PVFS2_CLIENT_CORE} ${PVFS2_CLIENT_ARGS}; then
        rc=3D1
	elif [ -n "${PVFS2_MOUNTS}" ]; then
        for server_mp in ${PVFS2_MOUNTS}; do
            mount -t pvfs2 \
                tcp://$(echo ${server_mp} | cut -d',' -f1)/pvfs2-fs \
                $(echo ${server_mp} | cut -d',' -f2)
            rc=3D$?
            [[ ${rc} -ne 0 ]] && break
        done
        [[ ${rc} -ne 0 ]] && start-stop-daemon --stop -p ${PVFS2_CLIENT_P=
IDFILE}=20
    fi

	eend ${rc}
}

stop() {
    local rc=3D0
    local server_mp
    checkconfig || return 1
	ebegin "Stopping pvfs2-client"

    if [ -n "${PVFS2_MOUNTS}" ]; then
        for server_mp in ${PVFS2_MOUNTS}; do
            umount -f $(echo ${server_mp} | cut -d',' -f2)
            rc=3D$?
            [[ ${rc} -ne 0 ]] && break
        done
    fi

    if [[ ${rc} -eq 0 ]]; then
	    start-stop-daemon --stop -p ${PVFS2_CLIENT_PIDFILE}=20
        rc=3D$?
    fi

	eend ${rc}
}




1.1                  sys-cluster/pvfs2/files/2.7.0-kernel-rt.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-kernel-rt.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-kernel-rt.patch?rev=3D1.1&content-type=3Dtext/plain

Index: 2.7.0-kernel-rt.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Index: pvfs2-config.h.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -u -N -r1.111 -r1.112
--- pvfs2-config.h.in	5 Nov 2007 21:07:54 -0000	1.111
+++ pvfs2-config.h.in	7 Dec 2007 23:05:56 -0000	1.112
@@ -198,6 +198,9 @@
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
=20
+/* Define if kernel defines mapping_nrpages macro -- defined by RT linux=
 */
+#undef HAVE_MAPPING_NRPAGES_MACRO
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
=20
@@ -258,6 +261,10 @@
 /* Define if kernel has register_ioctl32_conversion */
 #undef HAVE_REGISTER_IOCTL32_CONVERSION
=20
+/* Define if kernel address_space struct has a spin_lock for private dat=
a
+   instead of rw_lock -- used by RT linux */
+#undef HAVE_RT_PRIV_LOCK_ADDR_SPACE_STRUCT
+
 /* Define to 1 if you have the <SDL/SDL_ttf.h> header file. */
 #undef HAVE_SDL_SDL_TTF_H
=20
@@ -273,6 +280,9 @@
 /* Define if SLAB_KERNEL is defined in kernel */
 #undef HAVE_SLAB_KERNEL
=20
+/* Define if kernel address_space struct has a spin_lock instead of rw_l=
ock */
+#undef HAVE_SPIN_LOCK_ADDR_SPACE_STRUCT
+
 /* Define if struct super_operations in kernel has statfs_lite callback =
*/
 #undef HAVE_STATFS_LITE_SUPER_OPERATIONS
=20
Index: maint/config/kernel.m4
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /projects/cvsroot/pvfs2/maint/config/kernel.m4,v
diff -u -N -r1.46 -r1.47
--- maint/config/kernel.m4	6 Nov 2007 16:29:52 -0000	1.46
+++ maint/config/kernel.m4	7 Dec 2007 23:05:56 -0000	1.47
@@ -849,5 +849,44 @@
 	AC_MSG_RESULT(no)
 	)
=20
+	AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field)
+	AC_TRY_COMPILE([
+		#define __KERNEL__
+		#include <linux/fs.h>
+	], [
+		struct address_space as;
+		spin_lock(&as.page_lock);
+	],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_SPIN_LOCK_ADDR_SPACE_STRUCT, 1, [Define if kernel addres=
s_space struct has a spin_lock instead of rw_lock]),
+	AC_MSG_RESULT(no)
+	)
+
+	AC_MSG_CHECKING(if kernel address_space struct has a priv_lock field - =
from RT linux)
+	AC_TRY_COMPILE([
+		#define __KERNEL__
+		#include <linux/fs.h>
+	], [
+		struct address_space as;
+		spin_lock(&as.priv_lock);
+	],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_RT_PRIV_LOCK_ADDR_SPACE_STRUCT, 1, [Define if kernel add=
ress_space struct has a spin_lock for private data instead of rw_lock -- =
used by RT linux]),
+	AC_MSG_RESULT(no)
+	)
+
+	AC_MSG_CHECKING(if kernel defines mapping_nrpages macro - from RT linux=
)
+	AC_TRY_COMPILE([
+		#define __KERNEL__
+		#include <linux/fs.h>
+	], [
+		struct address_space idata;
+		int i =3D mapping_nrpages(&idata);
+	],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_MAPPING_NRPAGES_MACRO, 1, [Define if kernel defines mapp=
ing_nrpages macro -- defined by RT linux]),
+	AC_MSG_RESULT(no)
+	)
+
 	CFLAGS=3D$oldcflags
 ])



1.1                  sys-cluster/pvfs2/files/pvfs2-server-conf.d-2.7.0

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-server-conf.d-2.7.0?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/pvfs2-server-conf.d-2.7.0?rev=3D1.1&content-type=3Dtext/plain

Index: pvfs2-server-conf.d-2.7.0
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
# pvfs2 only uses one config file as of 2.7.0.  This is the path
# to that config file.
PVFS2_FS_CONF=3D"/etc/pvfs/pvfs2-fs.conf"

# your server binary, default is shown.
PVFS2_SERVER=3D/usr/sbin/pvfs2-server

# the server will record its PID in this file using the -p argument
PVFS2_PIDFILE=3D/var/run/pvfs2.pid

#Additional options
PVFS2_OPTIONS=3D""

# Automatically call pvfs2-server with --mkfs if the first call to start
# the daemon fails.  Off by default as this does mess with the local
# filesystem to prepare the directory for pvfs2-server
PVFS2_AUTO_MKFS=3D0



1.1                  sys-cluster/pvfs2/files/2.7.0-verbose-checking.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-verbose-checking.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-verbose-checking.patch?rev=3D1.1&content-type=3Dtext/plain

Index: 2.7.0-verbose-checking.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Index: maint/config/kernel.m4
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /projects/cvsroot/pvfs2/maint/config/kernel.m4,v
diff -u -N -r1.48 -r1.49
--- maint/config/kernel.m4	11 Jan 2008 15:00:08 -0000	1.48
+++ maint/config/kernel.m4	11 Jan 2008 15:02:14 -0000	1.49
@@ -849,7 +849,7 @@
 	AC_MSG_RESULT(no)
 	)
=20
-	AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field)
+	AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field na=
med page_lock)
 	AC_TRY_COMPILE([
 		#define __KERNEL__
 		#include <linux/fs.h>



1.1                  sys-cluster/pvfs2/files/2.7.0-gentoo-makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-gentoo-makefile.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-gentoo-makefile.patch?rev=3D1.1&content-type=3Dtext/plain

Index: 2.7.0-gentoo-makefile.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
diff -urN pvfs-2.7.0/Makefile.in pvfs-2.7.0_patched/Makefile.in
--- pvfs-2.7.0/Makefile.in	2008-02-28 10:27:37.000000000 -0500
+++ pvfs-2.7.0_patched/Makefile.in	2008-02-28 10:27:35.000000000 -0500
@@ -52,10 +52,14 @@
 # define a few generic variables that we need to use
 DESTDIR =3D
 srcdir =3D @srcdir@
-prefix =3D $(DESTDIR)@prefix@
+prefix =3D @prefix@
 datarootdir =3D $(DESTDIR)@datarootdir@
 mandir =3D $(DESTDIR)@mandir@
-exec_prefix =3D $(DESTDIR)@exec_prefix@
+exec_prefix =3D @exec_prefix@
+sbindir =3D $(DESTDIR)@sbindir@
+bindir =3D $(DESTDIR)@bindir@
+libdir =3D $(DESTDIR)@libdir@
+includedir =3D $(DESTDIR)@includedir@
=20
 VPATH =3D $(srcdir)
 SHELL =3D @SHELL@
@@ -63,6 +67,7 @@
 # TODO: should probably check for bison and flex in configure
 BISON =3D bison
 FLEX =3D flex
+LN_S =3D ln -s
 BUILD_BMI_TCP =3D @BUILD_BMI_TCP@
 BUILD_GM =3D @BUILD_GM@
 BUILD_MX =3D @BUILD_MX@
@@ -162,6 +167,9 @@
 REDHAT_RELEASE =3D @REDHAT_RELEASE@
 NPTL_WORKAROUND =3D @NPTL_WORKAROUND@
 STRICT_CFLAGS =3D @STRICT_CFLAGS@
+SO_FULL =3D 2.0.0
+SO_MAJOR =3D 2
+
 # for Solaris:
 # LIBS +=3D -lsocket -lnsl
=20
@@ -435,8 +443,10 @@
 LIBRARIES :=3D
 LIBRARIES_THREADED :=3D
 ifeq ($(build_shared),yes)
-LIBRARIES_SHARED =3D lib/libpvfs2.so
+LIBRARIES_SHARED =3D lib/libpvfs2.so.$(SO_FULL)
 LIBRARIES +=3D $(LIBRARIES_SHARED)
+LIBRARIES_THREADED_SHARED =3D lib/libpvfs2-threaded.so.$(SO_FULL)
+LIBRARIES_THREADED +=3D $(LIBRARIES_THREADED_SHARED)
 endif
 ifeq ($(build_static),yes)
 LIBRARIES_STATIC =3D lib/libpvfs2.a
@@ -627,16 +637,16 @@
 	$(E)ar rcs $@ $(LIBTHREADEDOBJS)
=20
 # rule for building the pvfs2 library
-lib/libpvfs2.so: $(LIBPICOBJS)
+lib/libpvfs2.so.$(SO_FULL): $(LIBPICOBJS)
 	$(Q) "  LDSO		$@"
 	$(E)$(INSTALL) -d lib
-	$(E)$(LDSHARED) -o $@ $(LIBPICOBJS)
+	$(E)$(LDSHARED) -Wl,-soname,libpvfs2.so -o $@ $(LIBPICOBJS)
=20
 # rule for building the pvfs2 _multithreaded_ library
-lib/libpvfs2-threaded.so: $(LIBTHREADEDPICOBJS)
+lib/libpvfs2-threaded.so.$(SO_FULL): $(LIBTHREADEDPICOBJS)
 	$(Q) "  LDSO		$@"
 	$(E)$(INSTALL) -d lib
-	$(E)$(LDSHARED) -o $@ $(LIBTHREADEDPICOBJS)
+	$(E)$(LDSHARED) -Wl,-soname,libpvfs2-threaded.so -o $@ $(LIBTHREADEDPIC=
OBJS)=20
=20
 # rule for building the pvfs2 server library
 lib/libpvfs2-server.a: $(SERVEROBJS)
@@ -713,7 +723,7 @@
=20
 # all applications depend on the pvfs2 library
 $(ADMINTOOLS): %: %.o $(LIBRARIES)
-$(ADMINTOOLS_SERVER): %: %.o $(LIBRARIES) lib/libpvfs2-server.a
+$(ADMINTOOLS_SERVER): %: %.o $(LIBRARIES)
 $(KERNAPPS): %: %.o $(LIBRARIES)
 $(KERNAPPSTHR): %: %.o $(LIBRARIES_THREADED)
=20
@@ -769,7 +779,7 @@
 	$(E)rm -f $(LIBOBJS) $(LIBTHREADEDOBJS) $(SERVEROBJS) $(MISCOBJS) \
 		$(LIBRARIES) $(LIBRARIES_THREADED) $(DEPENDS) $(SERVER) \
 		$(ADMINOBJS) $(ADMINOBJS_SERVER) $(ADMINTOOLS)\
-		$(ADMINTOOLS_SERVER) lib/libpvfs2-server.a\
+		$(ADMINTOOLS_SERVER) \
 		$(KERNAPPOBJS) $(KERNAPPS) $(KERNAPPSTHR) \
 		$(VISS) $(VISMISCOBJS) $(VISOBJS) $(VISDEPENDS)\
 		$(VISMISCDEPENDS) $(KARMAOBJS) $(LIBPICOBJS) \
@@ -883,43 +893,48 @@
 	install -m 644 $(srcdir)/doc/man/*.5 $(mandir)/man5
=20
 install:: all install_doc
-	install -d $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2.h $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2-request.h $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2-debug.h $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2-sysint.h $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2-types.h $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2-util.h $(prefix)/include
-	install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(prefix)/include
-
-	install -d $(prefix)/lib
-	install -m 755 $(LIBRARIES) $(prefix)/lib
+	install -d $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2.h $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2-request.h $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2-debug.h $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2-sysint.h $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2-types.h $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2-util.h $(includedir)
+	install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(includedir)
+
+	install -d $(libdir)
+	install -m 755 $(LIBRARIES) $(libdir)
+	install -m 755 $(LIBRARIES_THREADED) $(libdir)
+	$(LN_S) libpvfs2-threaded.so.$(SO_FULL) $(libdir)/libpvfs2-threaded.so.=
$(SO_MAJOR)
+	$(LN_S) libpvfs2-threaded.so.$(SO_FULL) $(libdir)/libpvfs2-threaded.so
+	$(LN_S) libpvfs2.so.$(SO_FULL) $(libdir)/libpvfs2.so.$(SO_MAJOR)
+	$(LN_S) libpvfs2.so.$(SO_FULL) $(libdir)/libpvfs2.so
=20
 ifdef TARGET_OS_DARWIN
 #       TOC needs to be regenerated in libs after they get moved
 	ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES))
 endif
=20
-	install -d $(prefix)/bin
-	install -m 755 $(ADMINTOOLS) $(prefix)/bin
-	install -m 755 src/apps/admin/pvfs2-config $(prefix)/bin
+	install -d $(bindir)
+	install -m 755 $(ADMINTOOLS) $(bindir)
+	install -m 755 src/apps/admin/pvfs2-config $(bindir)
 	@# if we ever auto-generate genconfig, remove the $(srcdir)
-	install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(prefix)/bin
-	install -m 755 $(srcdir)/src/apps/admin/pvfs2-config-convert $(prefix)/=
bin
+	install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(bindir)
+	install -m 755 $(srcdir)/src/apps/admin/pvfs2-config-convert $(bindir)
 ifdef BUILD_KARMA
-	install -m 755 $(KARMA) $(prefix)/bin
+	install -m 755 $(KARMA) $(bindir)
 endif
=20
-	install -d $(prefix)/sbin
+	install -d $(sbindir)
=20
 ifdef BUILD_SERVER
-	install -m 755 $(ADMINTOOLS_SERVER) $(prefix)/bin
+	install -m 755 $(ADMINTOOLS_SERVER) $(bindir)
     ifeq ($(NPTL_WORKAROUND),)
-	install -m 755 $(SERVER) $(prefix)/sbin
+	install -m 755 $(SERVER) $(sbindir)
     else
-	install -m 755 $(srcdir)/$(SERVER_STUB) $(prefix)/sbin/pvfs2-server
-	install -m 755 $(SERVER) $(prefix)/sbin/pvfs2-server.bin
+	install -m 755 $(srcdir)/$(SERVER_STUB) $(sbindir)/pvfs2-server
+	install -m 755 $(SERVER) $(sbindir)/pvfs2-server.bin
     endif
 endif
=20
@@ -939,9 +954,12 @@
 	install -m 755 src/kernel/linux-2.6/pvfs2.ko $(KMOD_DIR)
=20
 .PHONY: kmod_install
-kmod_install: kmod kernapps just_kmod_install
-	install -d $(prefix)/sbin
-	install -m 755 $(KERNAPPS) $(prefix)/sbin
+kmod_install: kmod kernapps_install just_kmod_install
+
+.PHONY: kernapps_install
+kernapps_install: kernapps
+	install -d $(sbindir)
+	install -m 755 $(KERNAPPS) $(sbindir)
 endif
=20
 ifneq (,$(LINUX24_KERNEL_SRC))
@@ -960,12 +978,15 @@
 	install -m 755 src/kernel/linux-2.4/pvfs2.o $(KMOD_DIR)
=20
 .PHONY: kmod24_install
-kmod24_install: kmod24 kernapps just_kmod24_install
-	install -d $(prefix)/sbin
-	install -m 755 $(KERNAPPS) $(prefix)/sbin
-	install -m 755 src/apps/kernel/linux/mount.pvfs2 $(prefix)/sbin
+kmod24_install: kmod24 kernapps_install just_kmod24_install
+
+.PHONY: kernapps_install
+kernapps_install: kernapps
+	install -d $(sbindir)
+	install -m 755 $(KERNAPPS) $(sbindir)
+	install -m 755 src/apps/kernel/linux/mount.pvfs2 $(sbindir)
 	@echo ""
 	@echo "For improved linux-2.4 support,"
-	@echo "install $(prefix)/sbin/mount.pvfs2 to /sbin/mount.pvfs2"
+	@echo "install $(sbindir)/mount.pvfs2 to /sbin/mount.pvfs2"
 	@echo ""
 endif



1.1                  sys-cluster/pvfs2/files/2.7.0-kmem_cache.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-kmem_cache.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/=
files/2.7.0-kmem_cache.patch?rev=3D1.1&content-type=3Dtext/plain

Index: 2.7.0-kmem_cache.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Index: pvfs2-config.h.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -u -r1.113 -r1.114
--- pvfs2-config.h.in	11 Jan 2008 15:00:08 -0000	1.113
+++ pvfs2-config.h.in	11 Jan 2008 20:30:17 -0000	1.114
@@ -159,6 +159,10 @@
 /* Define if kernel lacks device classes */
 #undef HAVE_KERNEL_DEVICE_CLASSES
=20
+/* Define if kernel kmem_cache_create constructor has new-style two-para=
meter
+   form */
+#undef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM
+
 /* Define if kernel kmem_cache_create has destructor param */
 #undef HAVE_KMEM_CACHE_CREATE_DESTRUCTOR_PARAM
=20
Index: maint/config/kernel.m4
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /projects/cvsroot/pvfs2/maint/config/kernel.m4,v
diff -u -r1.50 -r1.51
--- maint/config/kernel.m4	11 Jan 2008 20:07:20 -0000	1.50
+++ maint/config/kernel.m4	11 Jan 2008 20:30:16 -0000	1.51
@@ -126,6 +126,7 @@
 	AC_MSG_CHECKING(for struct kmem_cache in kernel)
 	AC_TRY_COMPILE([
 		#define __KERNEL__
+		#include <linux/kernel.h>
 		#include <linux/slab.h>
=20
 		int foo(struct kmem_cache *s)
@@ -866,6 +865,32 @@
 	AC_MSG_RESULT(no)
 	)
=20
+        dnl 2.6.24 changed the constructor parameter signature of
+	dnl kmem_cache_create.  Check for this newer two-param style and
+	dnl if not, assume it is old.  Note we can get away with just
+	dnl struct kmem_cache (and not kmem_cache_t) as that change happened
+	dnl in older kernels.  If they don't match, gcc complains about
+	dnl passing argument ... from incompatible pointer type, hence the
+	dnl need for the -Werror.
+	tmp_cflags=3D$CFLAGS
+	CFLAGS=3D"$CFLAGS -Werror"
+	AC_MSG_CHECKING(for two-param kmem_cache_create constructor)
+	AC_TRY_COMPILE([
+		#define __KERNEL__
+		#include <linux/kernel.h>
+		#include <linux/slab.h>
+		void ctor(struct kmem_cache *cachep, void *req)
+		{
+		}
+	], [
+		kmem_cache_create("config-test", 0, 0, 0, ctor);
+	],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM, 1, [Define if kernel k=
mem_cache_create constructor has new-style two-parameter form]),
+	AC_MSG_RESULT(no)
+	)
+	CFLAGS=3D$tmp_cflags
+
 	AC_MSG_CHECKING(if kernel address_space struct has a spin_lock field na=
med page_lock)
 	AC_TRY_COMPILE([
 		#define __KERNEL__
Index: src/kernel/linux-2.6/pvfs2-cache.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-cache.c,v
diff -u -r1.44 -r1.45
--- src/kernel/linux-2.6/pvfs2-cache.c	4 Nov 2007 01:38:57 -0000	1.44
+++ src/kernel/linux-2.6/pvfs2-cache.c	11 Jan 2008 20:30:17 -0000	1.45
@@ -202,10 +202,17 @@
     }
 }
=20
+
 static void dev_req_cache_ctor(
+#ifdef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM
+    struct kmem_cache *cachep,
+    void *req
+#else
     void *req,
     pvfs2_kmem_cache_t * cachep,
-    unsigned long flags)
+    unsigned long flags
+#endif
+)
 {
     memset(req, 0, sizeof(MAX_ALIGNED_DEV_REQ_DOWNSIZE));
 }
@@ -264,11 +271,17 @@
 }
=20
 static void pvfs2_inode_cache_ctor(
-    void *new_pvfs2_inode,
+#ifdef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM
+    struct kmem_cache *cachep,
+    void *req
+#else
+    void *req,
     pvfs2_kmem_cache_t * cachep,
-    unsigned long flags)
+    unsigned long flags
+#endif
+)
 {
-    pvfs2_inode_t *pvfs2_inode =3D (pvfs2_inode_t *)new_pvfs2_inode;
+    pvfs2_inode_t *pvfs2_inode =3D req;
=20
     memset(pvfs2_inode, 0, sizeof(pvfs2_inode_t));
     ClearInitFlag(pvfs2_inode);
@@ -382,9 +395,15 @@
 #ifdef HAVE_AIO_VFS_SUPPORT
=20
 static void kiocb_ctor(
+#ifdef HAVE_KMEM_CACHE_CREATE_CTOR_TWO_PARAM
+    struct kmem_cache *cachep,
+    void *req
+#else
     void *req,
     pvfs2_kmem_cache_t * cachep,
-    unsigned long flags)
+    unsigned long flags
+#endif
+)
 {
     memset(req, 0, sizeof(pvfs2_kiocb));
 }



--=20
gentoo-commits@lists.gentoo.org mailing list