Ebuild cleanup, version bump.

Package-Manager: portage-2.1.4.4

16 files changed, 13 insertions, 1402 deletions

diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog
index 1e07e90830ad..1233b72ec865 100644
--- a/sys-cluster/gfs-kernel/ChangeLog
+++ b/sys-cluster/gfs-kernel/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/gfs-kernel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.32 2008/03/21 22:50:08 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.33 2008/11/13 23:36:42 xmerlin Exp $
+
+*gfs-kernel-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  files/gfs-kernel-2.02.00-before-2.6.23.diff,
+  -gfs-kernel-1.02.00-r1.ebuild, -gfs-kernel-1.02.00-r2.ebuild,
+  -gfs-kernel-1.03.00-r1.ebuild, -gfs-kernel-1.04.00.ebuild,
+  -gfs-kernel-1.04.00-r1.ebuild, -gfs-kernel-2.02.00.ebuild,
+  +gfs-kernel-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
   21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
   -files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff,
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.02.00-20060714-cvs-compile.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.02.00-20060714-cvs-compile.patch
deleted file mode 100644
index 8d79c660c55e..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-1.02.00-20060714-cvs-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gfs-kernel/src/gfs/ops_inode.c.orig	2006-07-14 14:32:00.000000000 +0200
-+++ gfs-kernel/src/gfs/ops_inode.c	2006-07-14 14:32:07.000000000 +0200
-@@ -24,7 +24,7 @@
- #include <linux/mm.h>
- #include <linux/xattr.h>
- #include <linux/posix_acl.h>
--#include <cluster/cnxman.h>
-+#include <../dlm/cnxman.h>
- 
- #include "gfs.h"
- #include "acl.h"
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-post-2.6.18.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-post-2.6.18.patch
deleted file mode 100644
index 8fbb53effe00..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-post-2.6.18.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/dlm/lock_dlm.h cluster-1.03.00/gfs-kernel/src/dlm/lock_dlm.h
---- cluster-1.03.00.orig/gfs-kernel/src/dlm/lock_dlm.h	2006-07-12 23:58:29.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/dlm/lock_dlm.h	2007-03-09 21:00:27.000000000 +0100
-@@ -24,7 +24,7 @@
- #include <linux/socket.h>
- #include <linux/kthread.h>
- #include <net/sock.h>
--#include <linux/lm_interface.h>
-+#include "lm_interface.h"
- #include <cluster/cnxman.h>
- #include <cluster/service.h>
- #include <cluster/dlm.h>
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/gfs.h cluster-1.03.00/gfs-kernel/src/gfs/gfs.h
---- cluster-1.03.00.orig/gfs-kernel/src/gfs/gfs.h	2006-08-16 23:52:45.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gfs/gfs.h	2007-03-09 21:46:50.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- #define GFS_RELEASE_NAME "1.03.00"
- 
--#include <linux/lm_interface.h>
-+#include "lm_interface.h"
- #include <linux/gfs_ondisk.h>
- 
- #include "fixed_div64.h"
-@@ -67,8 +67,8 @@
- 
- #define get_v2sdp(sb) ((struct gfs_sbd *)(sb)->s_fs_info)
- #define set_v2sdp(sb, sdp) (sb)->s_fs_info = (sdp)
--#define get_v2ip(inode) ((struct gfs_inode *)(inode)->u.generic_ip)
--#define set_v2ip(inode, ip) (inode)->u.generic_ip = (ip)
-+#define get_v2ip(inode) ((struct gfs_inode *)(inode)->i_private)
-+#define set_v2ip(inode, ip) (inode)->i_private = (ip)
- #define get_v2fp(file) ((struct gfs_file *)(file)->private_data)
- #define set_v2fp(file, fp) (file)->private_data = (fp)
- #define get_v2bd(bh) ((struct gfs_bufdata *)(bh)->b_private)
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/inode.c cluster-1.03.00/gfs-kernel/src/gfs/inode.c
---- cluster-1.03.00.orig/gfs-kernel/src/gfs/inode.c	2005-09-18 05:01:24.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gfs/inode.c	2007-03-09 21:48:37.000000000 +0100
-@@ -97,7 +97,6 @@
- 	inode->i_mtime.tv_sec = ip->i_di.di_mtime;
- 	inode->i_ctime.tv_sec = ip->i_di.di_ctime;
- 	inode->i_atime.tv_nsec = inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = 0;
--	inode->i_blksize = PAGE_SIZE;
- 	inode->i_blocks = ip->i_di.di_blocks <<
- 		(ip->i_sbd->sd_sb.sb_bsize_shift - GFS_BASIC_BLOCK_SHIFT);
- 	inode->i_generation = ip->i_di.di_header.mh_incarn;
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_inode.c cluster-1.03.00/gfs-kernel/src/gfs/ops_inode.c
---- cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_inode.c	2006-08-16 16:40:54.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gfs/ops_inode.c	2007-03-09 21:50:15.000000000 +0100
-@@ -171,22 +171,22 @@
- 	parent = dget_parent(dentry);
- 
- 	if (gfs_filecmp(&dentry->d_name, "@hostname", 9))
--		new = lookup_one_len(system_utsname.nodename,
-+		new = lookup_one_len(init_utsname()->nodename,
- 				     parent,
--				     strlen(system_utsname.nodename));
-+				     strlen(init_utsname()->nodename));
- 	else if (gfs_filecmp(&dentry->d_name, "@nodeid", 7))
- 		new = lookup_one_len(buf, 
- 				     parent, 
- 				     sprintf(buf, "%s%i", "node", 
- 					     get_my_nodeid()));
- 	else if (gfs_filecmp(&dentry->d_name, "@mach", 5))
--		new = lookup_one_len(system_utsname.machine,
-+		new = lookup_one_len(init_utsname()->machine,
- 				     parent,
--				     strlen(system_utsname.machine));
-+				     strlen(init_utsname()->machine));
- 	else if (gfs_filecmp(&dentry->d_name, "@os", 3))
--		new = lookup_one_len(system_utsname.sysname,
-+		new = lookup_one_len(init_utsname()->sysname,
- 				     parent,
--				     strlen(system_utsname.sysname));
-+				     strlen(init_utsname()->sysname));
- 	else if (gfs_filecmp(&dentry->d_name, "@uid", 4))
- 		new = lookup_one_len(buf,
- 				     parent,
-@@ -199,8 +199,8 @@
- 		new = lookup_one_len(buf,
- 				     parent,
- 				     sprintf(buf, "%s_%s",
--					     system_utsname.machine,
--					     system_utsname.sysname));
-+					     init_utsname()->machine,
-+					     init_utsname()->sysname));
- 	else if (gfs_filecmp(&dentry->d_name, "@jid", 4))
- 		new = lookup_one_len(buf,
- 				     parent,
-@@ -235,22 +235,22 @@
- 	parent = dget_parent(dentry);
- 
- 	if (gfs_filecmp(&dentry->d_name, "{hostname}", 10))
--		new = lookup_one_len(system_utsname.nodename,
-+		new = lookup_one_len(init_utsname()->nodename,
- 				     parent,
--				     strlen(system_utsname.nodename));
-+				     strlen(init_utsname()->nodename));
- 	else if (gfs_filecmp(&dentry->d_name, "{nodeid}", 8))
- 		new = lookup_one_len(buf,
- 				     parent,
- 				     sprintf(buf, "%s%i", "node",
- 					     get_my_nodeid()));
- 	else if (gfs_filecmp(&dentry->d_name, "{mach}", 6))
--		new = lookup_one_len(system_utsname.machine,
-+		new = lookup_one_len(init_utsname()->machine,
- 				     parent,
--				     strlen(system_utsname.machine));
-+				     strlen(init_utsname()->machine));
- 	else if (gfs_filecmp(&dentry->d_name, "{os}", 4))
--		new = lookup_one_len(system_utsname.sysname,
-+		new = lookup_one_len(init_utsname()->sysname,
- 				     parent,
--				     strlen(system_utsname.sysname));
-+				     strlen(init_utsname()->sysname));
- 	else if (gfs_filecmp(&dentry->d_name, "{uid}", 5))
- 		new = lookup_one_len(buf,
- 				     parent,
-@@ -263,8 +263,8 @@
- 		new = lookup_one_len(buf,
- 				     parent,
- 				     sprintf(buf, "%s_%s",
--					     system_utsname.machine,
--					     system_utsname.sysname));
-+					     init_utsname()->machine,
-+					     init_utsname()->sysname));
- 	else if (gfs_filecmp(&dentry->d_name, "{jid}", 5))
- 		new = lookup_one_len(buf,
- 				     parent,
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gulm/gulm.h cluster-1.03.00/gfs-kernel/src/gulm/gulm.h
---- cluster-1.03.00.orig/gfs-kernel/src/gulm/gulm.h	2006-08-16 23:53:36.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gulm/gulm.h	2007-03-09 21:03:23.000000000 +0100
-@@ -24,7 +24,6 @@
- #include <linux/slab.h>
- #include <linux/spinlock.h>
- #include <asm/atomic.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/smp_lock.h>
- #include <linux/list.h>
-@@ -73,7 +72,7 @@
- /*  Divide x by y.  Round up if there is a remainder.  */
- #define DIV_RU(x, y) (((x) + (y) - 1) / (y))
- 
--#include <linux/lm_interface.h>
-+#include "lm_interface.h"
- 
- #include "gulm_prints.h"
- 
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gulm/gulm_fs.c cluster-1.03.00/gfs-kernel/src/gulm/gulm_fs.c
---- cluster-1.03.00.orig/gfs-kernel/src/gulm/gulm_fs.c	2005-03-04 21:08:00.000000000 +0100
-+++ cluster-1.03.00/gfs-kernel/src/gulm/gulm_fs.c	2007-03-09 21:06:14.000000000 +0100
-@@ -258,7 +258,7 @@
- 		if (hostdata != NULL && strlen (hostdata) > 0) {
- 			strncpy (gulm_cm.myName, hostdata, 64);
- 		} else {
--			strncpy (gulm_cm.myName, system_utsname.nodename, 64);
-+			strncpy (gulm_cm.myName, init_utsname()->nodename, 64);
- 		}
- 		gulm_cm.myName[63] = '\0';
- 
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gulm/handler.h cluster-1.03.00/gfs-kernel/src/gulm/handler.h
---- cluster-1.03.00.orig/gfs-kernel/src/gulm/handler.h	2004-06-24 10:53:28.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gulm/handler.h	2007-03-09 21:00:13.000000000 +0100
-@@ -13,7 +13,7 @@
- 
- #ifndef __handler_c__
- #define __handler_c__
--#include <linux/lm_interface.h>
-+#include "lm_interface.h"
- 
- struct callback_qu_s {
- 	struct completion startup;
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/harness/main.c cluster-1.03.00/gfs-kernel/src/harness/main.c
---- cluster-1.03.00.orig/gfs-kernel/src/harness/main.c	2006-08-16 23:53:01.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/harness/main.c	2007-03-09 20:58:29.000000000 +0100
-@@ -19,7 +19,7 @@
- #include <linux/sched.h>
- #include <linux/kmod.h>
- #include <linux/fs.h>
--#include <linux/lm_interface.h>
-+#include "lm_interface.h"
- 
- #define RELEASE_NAME "1.03.00"
- 
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c cluster-1.03.00/gfs-kernel/src/nolock/main.c
---- cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c	2006-08-16 23:53:20.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/nolock/main.c	2007-03-09 20:59:52.000000000 +0100
-@@ -18,7 +18,7 @@
- #include <linux/types.h>
- #include <linux/fs.h>
- #include <linux/smp_lock.h>
--#include <linux/lm_interface.h>
-+#include "lm_interface.h"
- 
- #define RELEASE_NAME "1.03.00"
- 
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch
deleted file mode 100644
index d9ead98e8224..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/diaper.c cluster-1.03.00/gfs-kernel/src/gfs/diaper.c
---- cluster-1.03.00.orig/gfs-kernel/src/gfs/diaper.c	2006-06-26 23:53:51.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gfs/diaper.c	2006-08-30 18:18:06.000000000 +0200
-@@ -232,9 +232,9 @@
- 	struct inode *inode;
- 	int error;
- 
--	mutex_lock(&real->bd_mount_mutex);
-+	down(&real->bd_mount_sem);
- 	sb = sget(&gfs_fs_type, gfs_test_bdev_super, gfs_set_bdev_super, real);
--	mutex_unlock(&real->bd_mount_mutex);
-+	up(&real->bd_mount_sem);
- 	if (IS_ERR(sb))
- 		return PTR_ERR(sb);
- 
-@@ -363,7 +363,7 @@
- 	if (!diaper)
- 		goto fail_remove;
- 
--	mutex_lock(&diaper->bd_mutex);
-+	down(&diaper->bd_sem);
- 	if (!diaper->bd_openers) {
- 		diaper->bd_disk = gd;
- 		diaper->bd_contains = diaper;
-@@ -372,7 +372,7 @@
- 	} else
- 		printk("GFS: diaper: reopening\n");
- 	diaper->bd_openers++;
--	mutex_unlock(&diaper->bd_mutex);
-+	up(&diaper->bd_sem);
- 
- 	dh->dh_mempool = mempool_create(512,
- 					mempool_alloc_slab, mempool_free_slab,
-@@ -395,14 +395,14 @@
- 	mempool_destroy(dh->dh_mempool);
- 
-  fail_bdput:
--	mutex_lock(&diaper->bd_mutex);
-+	down(&diaper->bd_sem);
- 	if (!--diaper->bd_openers) {
- 		invalidate_bdev(diaper, 1);
- 		diaper->bd_contains = NULL;
- 		diaper->bd_disk = NULL;
- 	} else
- 		printk("GFS: diaper: not closed\n");
--	mutex_unlock(&diaper->bd_mutex);
-+	up(&diaper->bd_sem);
- 	bdput(diaper);	
- 
-  fail_remove:
-@@ -437,14 +437,14 @@
- 
- 	mempool_destroy(dh->dh_mempool);
- 
--	mutex_lock(&diaper->bd_mutex);
-+	down(&diaper->bd_sem);
- 	if (!--diaper->bd_openers) {
- 		invalidate_bdev(diaper, 1);
- 		diaper->bd_contains = NULL;
- 		diaper->bd_disk = NULL;
- 	} else
- 		printk("GFS: diaper: not closed\n");
--	mutex_unlock(&diaper->bd_mutex);
-+	up(&diaper->bd_sem);
- 
- 	bdput(diaper);
- 	del_gendisk(gd);
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_file.c cluster-1.03.00/gfs-kernel/src/gfs/ops_file.c
---- cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_file.c	2006-06-29 18:50:41.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gfs/ops_file.c	2006-08-30 18:18:06.000000000 +0200
-@@ -1465,13 +1465,12 @@
- 
- 	if (sdp->sd_args.ar_localflocks) {
- 		if (IS_GETLK(cmd)) {
--			struct file_lock tmp;
--			int ret;
-+			struct file_lock *tmp;
- 			lock_kernel();
--			ret = posix_test_lock(file, fl, &tmp);
-+			tmp = posix_test_lock(file, fl);
- 			fl->fl_type = F_UNLCK;
--			if (ret)
--				memcpy(fl, &tmp, sizeof(struct file_lock));
-+			if (tmp)
-+				memcpy(fl, tmp, sizeof(struct file_lock));
- 			unlock_kernel();
- 		        return 0;
- 		} else {
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_fstype.c cluster-1.03.00/gfs-kernel/src/gfs/ops_fstype.c
---- cluster-1.03.00.orig/gfs-kernel/src/gfs/ops_fstype.c	2006-06-29 18:50:41.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/gfs/ops_fstype.c	2006-08-30 18:18:06.000000000 +0200
-@@ -697,9 +697,9 @@
- 		return (struct super_block *)diaper;
- 	}
- 
--	mutex_lock(&diaper->bd_mount_mutex);
-+	down(&diaper->bd_mount_sem);
- 	sb = sget(fs_type, gfs_test_bdev_super, gfs_set_bdev_super, diaper);
--	mutex_unlock(&diaper->bd_mount_mutex);
-+	up(&diaper->bd_mount_sem);
- 	if (IS_ERR(sb))
- 		goto out;
- 
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c cluster-1.03.00/gfs-kernel/src/nolock/main.c
---- cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c	2006-08-16 23:53:20.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/nolock/main.c	2006-08-30 18:18:06.000000000 +0200
-@@ -243,14 +243,13 @@
- 		 struct lm_lockname *name,
- 		 struct file *file, struct file_lock *fl)
- {
--	struct file_lock tmp;
--	int ret;
-+	struct file_lock *tmp;
- 
- 	lock_kernel();
--	ret = posix_test_lock(file, fl, &tmp);
-+	tmp = posix_test_lock(file, fl);
- 	fl->fl_type = F_UNLCK;
--	if (ret)
--		memcpy(fl, &tmp, sizeof(struct file_lock));
-+	if (tmp)
-+		memcpy(fl, tmp, sizeof(struct file_lock));
- 	unlock_kernel();
- 
- 	return 0;
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.12-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.12-compilefix.patch
deleted file mode 100644
index 1d2d1c16e50d..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.12-compilefix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- cluster-1.04.00/gfs-kernel/src/gfs/diaper.c	2007-09-11 13:20:51.000000000 +0300
-+++ cluster-1.04.00/gfs-kernel/src/gfs/diaper.c	2007-09-11 13:20:59.000000000 +0300
-@@ -397,7 +397,7 @@
-  fail_bdput:
- 	mutex_lock(&diaper->bd_mutex);
- 	if (!--diaper->bd_openers) {
--		invalidate_bdev(diaper, 1);
-+		invalidate_bdev(diaper);
- 		diaper->bd_contains = NULL;
- 		diaper->bd_disk = NULL;
- 	} else
-@@ -440,7 +440,7 @@
- 
- 	mutex_lock(&diaper->bd_mutex);
- 	if (!--diaper->bd_openers) {
--		invalidate_bdev(diaper, 1);
-+		invalidate_bdev(diaper);
- 		diaper->bd_contains = NULL;
- 		diaper->bd_disk = NULL;
- 	} else
---- cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c	2007-02-23 22:57:29.000000000 +0200
-+++ cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c	2007-09-11 13:50:46.000000000 +0300
-@@ -726,13 +726,6 @@
- 			goto error;
- 		}
- 		sb->s_flags |= MS_ACTIVE;
--		/* Equivilant of bdev_uevent(bdev, KOBJ_MOUNT): */
--		if (real->bd_disk) {
--			if (real->bd_part)
--				kobject_uevent(&real->bd_part->kobj, KOBJ_MOUNT);
--			else
--				kobject_uevent(&real->bd_disk->kobj, KOBJ_MOUNT);
--		}
- 	}
- 
- 	return simple_set_mnt(mnt, sb);
-@@ -761,13 +754,6 @@
- 	struct block_device *real = gfs_diaper_2real(diaper);
- 	unsigned long bsize = block_size(real);
- 
--	/* Equivalent of bdev_uevent(bdev, KOBJ_UMOUNT); */
--	if (real->bd_disk) {
--		if (real->bd_part)
--			kobject_uevent(&real->bd_part->kobj, KOBJ_UMOUNT);
--		else
--			kobject_uevent(&real->bd_disk->kobj, KOBJ_UMOUNT);
--	}
- 	generic_shutdown_super(sb);
- 	set_blocksize(diaper, bsize);
- 	set_blocksize(real, bsize);
-
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.17-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.17-compilefix.patch
deleted file mode 100644
index c372de564f32..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.17-compilefix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -uNr cluster-1.04.00.orig/gfs-kernel/src/gfs/ops_file.c cluster-1.03.00/gfs-kernel/src/gfs/ops_file.c
---- cluster-1.04.00.orig/gfs-kernel/src/gfs/ops_file.c	2006-06-29 18:50:41.000000000 +0200
-+++ cluster-1.04.00/gfs-kernel/src/gfs/ops_file.c	2006-08-30 18:18:06.000000000 +0200
-@@ -1465,13 +1465,12 @@
- 
- 	if (sdp->sd_args.ar_localflocks) {
- 		if (IS_GETLK(cmd)) {
--			struct file_lock tmp;
--			int ret;
-+			struct file_lock *tmp;
- 			lock_kernel();
--			ret = posix_test_lock(file, fl, &tmp);
-+			tmp = posix_test_lock(file, fl);
- 			fl->fl_type = F_UNLCK;
--			if (ret)
--				memcpy(fl, &tmp, sizeof(struct file_lock));
-+			if (tmp)
-+				memcpy(fl, tmp, sizeof(struct file_lock));
- 			unlock_kernel();
- 		        return 0;
- 		} else {
-diff -uNr cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c cluster-1.03.00/gfs-kernel/src/nolock/main.c
---- cluster-1.03.00.orig/gfs-kernel/src/nolock/main.c	2006-08-16 23:53:20.000000000 +0200
-+++ cluster-1.03.00/gfs-kernel/src/nolock/main.c	2006-08-30 18:18:06.000000000 +0200
-@@ -243,14 +243,13 @@
- 		 struct lm_lockname *name,
- 		 struct file *file, struct file_lock *fl)
- {
--	struct file_lock tmp;
--	int ret;
-+	struct file_lock *tmp;
- 
- 	lock_kernel();
--	ret = posix_test_lock(file, fl, &tmp);
-+	tmp = posix_test_lock(file, fl);
- 	fl->fl_type = F_UNLCK;
--	if (ret)
--		memcpy(fl, &tmp, sizeof(struct file_lock));
-+	if (tmp)
-+		memcpy(fl, tmp, sizeof(struct file_lock));
- 	unlock_kernel();
- 
- 	return 0;
-
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch
deleted file mode 100644
index 1d2d1c16e50d..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-1.04.00-post2.6.22-compilefix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- cluster-1.04.00/gfs-kernel/src/gfs/diaper.c	2007-09-11 13:20:51.000000000 +0300
-+++ cluster-1.04.00/gfs-kernel/src/gfs/diaper.c	2007-09-11 13:20:59.000000000 +0300
-@@ -397,7 +397,7 @@
-  fail_bdput:
- 	mutex_lock(&diaper->bd_mutex);
- 	if (!--diaper->bd_openers) {
--		invalidate_bdev(diaper, 1);
-+		invalidate_bdev(diaper);
- 		diaper->bd_contains = NULL;
- 		diaper->bd_disk = NULL;
- 	} else
-@@ -440,7 +440,7 @@
- 
- 	mutex_lock(&diaper->bd_mutex);
- 	if (!--diaper->bd_openers) {
--		invalidate_bdev(diaper, 1);
-+		invalidate_bdev(diaper);
- 		diaper->bd_contains = NULL;
- 		diaper->bd_disk = NULL;
- 	} else
---- cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c	2007-02-23 22:57:29.000000000 +0200
-+++ cluster-1.04.00/gfs-kernel/src/gfs/ops_fstype.c	2007-09-11 13:50:46.000000000 +0300
-@@ -726,13 +726,6 @@
- 			goto error;
- 		}
- 		sb->s_flags |= MS_ACTIVE;
--		/* Equivilant of bdev_uevent(bdev, KOBJ_MOUNT): */
--		if (real->bd_disk) {
--			if (real->bd_part)
--				kobject_uevent(&real->bd_part->kobj, KOBJ_MOUNT);
--			else
--				kobject_uevent(&real->bd_disk->kobj, KOBJ_MOUNT);
--		}
- 	}
- 
- 	return simple_set_mnt(mnt, sb);
-@@ -761,13 +754,6 @@
- 	struct block_device *real = gfs_diaper_2real(diaper);
- 	unsigned long bsize = block_size(real);
- 
--	/* Equivalent of bdev_uevent(bdev, KOBJ_UMOUNT); */
--	if (real->bd_disk) {
--		if (real->bd_part)
--			kobject_uevent(&real->bd_part->kobj, KOBJ_UMOUNT);
--		else
--			kobject_uevent(&real->bd_disk->kobj, KOBJ_UMOUNT);
--	}
- 	generic_shutdown_super(sb);
- 	set_blocksize(diaper, bsize);
- 	set_blocksize(real, bsize);
-
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-before-2.6.23.diff b/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-before-2.6.23.diff
deleted file mode 100644
index 57159fcf33f1..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-before-2.6.23.diff
+++ /dev/null
@@ -1,353 +0,0 @@
-diff -uNr cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/main.c cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/main.c
---- cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/main.c	2008-02-26 16:37:43.000000000 +0100
-+++ cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/main.c	2008-03-21 03:01:47.000000000 +0100
-@@ -53,7 +53,7 @@
- 
- 	gfs_glock_cachep = kmem_cache_create("gfs_glock", sizeof(struct gfs_glock),
- 					     0, 0,
--					     NULL);
-+					     NULL, NULL);
- 	gfs_inode_cachep = NULL;
- 	gfs_bufdata_cachep = NULL;
- 	gfs_mhc_cachep = NULL;
-@@ -63,19 +63,19 @@
- 
- 	gfs_inode_cachep = kmem_cache_create("gfs_inode", sizeof(struct gfs_inode),
- 					     0, 0,
--					     NULL);
-+					     NULL, NULL);
- 	if (!gfs_inode_cachep)
- 		goto fail1;
- 
- 	gfs_bufdata_cachep = kmem_cache_create("gfs_bufdata", sizeof(struct gfs_bufdata),
- 					       0, 0,
--					       NULL);
-+					       NULL, NULL);
- 	if (!gfs_bufdata_cachep)
- 		goto fail1;
- 
- 	gfs_mhc_cachep = kmem_cache_create("gfs_meta_header_cache", sizeof(struct gfs_meta_header_cache),
- 					   0, 0,
--					   NULL);
-+					   NULL, NULL);
- 	if (!gfs_mhc_cachep)
- 		goto fail;
- 
-diff -uNr cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/main.c.orig cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/main.c.orig
---- cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/main.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/main.c.orig	2008-02-26 16:37:43.000000000 +0100
-@@ -0,0 +1,137 @@
-+/******************************************************************************
-+*******************************************************************************
-+**
-+**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-+**  Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
-+**
-+**  This copyrighted material is made available to anyone wishing to use,
-+**  modify, copy, or redistribute it subject to the terms and conditions
-+**  of the GNU General Public License v.2.
-+**
-+*******************************************************************************
-+******************************************************************************/
-+
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/smp_lock.h>
-+#include <linux/spinlock.h>
-+#include <asm/semaphore.h>
-+#include <linux/completion.h>
-+#include <linux/buffer_head.h>
-+#include <linux/proc_fs.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/time.h>
-+
-+#include "gfs.h"
-+#include "ops_fstype.h"
-+#include "sys.h"
-+#include "proc.h"
-+
-+/**
-+ * init_gfs_fs - Register GFS as a filesystem
-+ *
-+ * Returns: 0 on success, error code on failure
-+ */
-+
-+int __init init_gfs_fs(void)
-+{
-+	int error;
-+	struct timespec tv;
-+
-+/*	gfs2_init_lmh(); gfs2 should do this for us*/
-+
-+	error = gfs_sys_init();
-+	if (error)
-+		return error;
-+	error = gfs_proc_init();
-+	if (error)
-+		goto fail;
-+
-+	getnstimeofday(&tv);
-+	gfs_random_number = tv.tv_nsec;
-+
-+	gfs_glock_cachep = kmem_cache_create("gfs_glock", sizeof(struct gfs_glock),
-+					     0, 0,
-+					     NULL);
-+	gfs_inode_cachep = NULL;
-+	gfs_bufdata_cachep = NULL;
-+	gfs_mhc_cachep = NULL;
-+	error = -ENOMEM;
-+	if (!gfs_glock_cachep)
-+		goto fail1;
-+
-+	gfs_inode_cachep = kmem_cache_create("gfs_inode", sizeof(struct gfs_inode),
-+					     0, 0,
-+					     NULL);
-+	if (!gfs_inode_cachep)
-+		goto fail1;
-+
-+	gfs_bufdata_cachep = kmem_cache_create("gfs_bufdata", sizeof(struct gfs_bufdata),
-+					       0, 0,
-+					       NULL);
-+	if (!gfs_bufdata_cachep)
-+		goto fail1;
-+
-+	gfs_mhc_cachep = kmem_cache_create("gfs_meta_header_cache", sizeof(struct gfs_meta_header_cache),
-+					   0, 0,
-+					   NULL);
-+	if (!gfs_mhc_cachep)
-+		goto fail;
-+
-+	error = register_filesystem(&gfs_fs_type);
-+	if (error)
-+		goto fail;
-+
-+	printk("GFS %s (built %s %s) installed\n",
-+	       RELEASE_VERSION, __DATE__, __TIME__);
-+
-+	return 0;
-+
-+ fail1:
-+	if (gfs_mhc_cachep)
-+		kmem_cache_destroy(gfs_mhc_cachep);
-+
-+	if (gfs_bufdata_cachep)
-+		kmem_cache_destroy(gfs_bufdata_cachep);
-+
-+	if (gfs_inode_cachep)
-+		kmem_cache_destroy(gfs_inode_cachep);
-+
-+	if (gfs_glock_cachep)
-+		kmem_cache_destroy(gfs_glock_cachep);
-+
-+	gfs_proc_uninit();
-+	
-+ fail:
-+	gfs_sys_uninit();
-+
-+	return error;
-+}
-+
-+/**
-+ * exit_gfs_fs - Unregister the file system
-+ *
-+ */
-+
-+void __exit
-+exit_gfs_fs(void)
-+{
-+	unregister_filesystem(&gfs_fs_type);
-+
-+	kmem_cache_destroy(gfs_mhc_cachep);
-+	kmem_cache_destroy(gfs_bufdata_cachep);
-+	kmem_cache_destroy(gfs_inode_cachep);
-+	kmem_cache_destroy(gfs_glock_cachep);
-+
-+	gfs_proc_uninit();
-+	gfs_sys_uninit();
-+}
-+
-+MODULE_DESCRIPTION("Global File System " RELEASE_VERSION);
-+MODULE_AUTHOR("Red Hat, Inc.");
-+MODULE_LICENSE("GPL");
-+
-+module_init(init_gfs_fs);
-+module_exit(exit_gfs_fs);
-+
-diff -uNr cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_export.c cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/ops_export.c
---- cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_export.c	2008-03-21 03:01:29.000000000 +0100
-+++ cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/ops_export.c	2008-03-21 03:01:47.000000000 +0100
-@@ -18,7 +18,6 @@
- #include <asm/semaphore.h>
- #include <linux/completion.h>
- #include <linux/buffer_head.h>
--#include <linux/exportfs.h>
- 
- #include "gfs.h"
- #include "dio.h"
-diff -uNr cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_vm.c cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/ops_vm.c
---- cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_vm.c	2008-03-21 03:01:29.000000000 +0100
-+++ cluster-2.02.00-2.6.20/gfs-kernel/src/gfs/ops_vm.c	2008-03-21 03:01:47.000000000 +0100
-@@ -13,6 +13,7 @@
- 
- #include <linux/sched.h>
- #include <linux/slab.h>
-+#include <linux/smp_lock.h>
- #include <linux/spinlock.h>
- #include <asm/semaphore.h>
- #include <linux/completion.h>
-@@ -52,7 +53,7 @@
- }
- 
- /**
-- * gfs_private_fault -
-+ * gfs_private_nopage -
-  * @area:
-  * @address:
-  * @type:
-@@ -60,29 +61,31 @@
-  * Returns: the page
-  */
- 
--static int gfs_private_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+static struct page *
-+gfs_private_nopage(struct vm_area_struct *area,
-+		   unsigned long address, int *type)
- {
--	struct gfs_inode *ip = get_v2ip(vma->vm_file->f_mapping->host);
-+	struct gfs_inode *ip = get_v2ip(area->vm_file->f_mapping->host);
- 	struct gfs_holder i_gh;
-+	struct page *result;
- 	int error;
--	int ret = 0;
- 
- 	atomic_inc(&ip->i_sbd->sd_ops_vm);
- 
- 	error = gfs_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &i_gh);
- 	if (error)
--		goto out;
-+		return NULL;
- 
- 	set_bit(GIF_PAGED, &ip->i_flags);
- 
--	ret = filemap_fault(vma, vmf);
-+	result = filemap_nopage(area, address, type);
- 
--	if (ret && ret != VM_FAULT_OOM)
-+	if (result && result != NOPAGE_OOM)
- 		pfault_be_greedy(ip);
- 
- 	gfs_glock_dq_uninit(&i_gh);
-- out:
--	return ret;
-+
-+	return result;
- }
- 
- /**
-@@ -167,7 +170,7 @@
- }
- 
- /**
-- * gfs_sharewrite_fault -
-+ * gfs_sharewrite_nopage -
-  * @area:
-  * @address:
-  * @type:
-@@ -175,72 +178,61 @@
-  * Returns: the page
-  */
- 
--static int gfs_sharewrite_fault(struct vm_area_struct *vma,
--				struct vm_fault *vmf)
-+static struct page *
-+gfs_sharewrite_nopage(struct vm_area_struct *area,
-+		      unsigned long address, int *type)
- {
--	struct file *file = vma->vm_file;
--	struct gfs_file *gf = file->private_data;
--	struct gfs_inode *ip = get_v2ip(vma->vm_file->f_mapping->host);
-+	struct gfs_inode *ip = get_v2ip(area->vm_file->f_mapping->host);
- 	struct gfs_holder i_gh;
-+	struct page *result = NULL;
-+	unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) + area->vm_pgoff;
- 	int alloc_required;
- 	int error;
--	int ret = 0;
- 
- 	atomic_inc(&ip->i_sbd->sd_ops_vm);
- 
- 	error = gfs_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh);
- 	if (error)
--		goto out;
-+		return NULL;
- 
- 	if (gfs_is_jdata(ip))
--		goto out_unlock;
-+		goto out;
- 
- 	set_bit(GIF_PAGED, &ip->i_flags);
- 	set_bit(GIF_SW_PAGED, &ip->i_flags);
- 
--	error = gfs_write_alloc_required(ip,
--					 (u64)vmf->pgoff << PAGE_CACHE_SHIFT,
-+	error = gfs_write_alloc_required(ip, (uint64_t)index << PAGE_CACHE_SHIFT,
- 					 PAGE_CACHE_SIZE, &alloc_required);
--	if (error) {
--		ret = VM_FAULT_OOM; /* XXX: are these right? */
--		goto out_unlock;
--	}
-+	if (error)
-+		goto out;
- 
--	ret = filemap_fault(vma, vmf);
--	if (ret & VM_FAULT_ERROR)
--		goto out_unlock;
-+	result = filemap_nopage(area, address, type);
-+	if (!result || result == NOPAGE_OOM)
-+		goto out;
- 
- 	if (alloc_required) {
--		/* XXX: do we need to drop page lock around alloc_page_backing?*/
--		error = alloc_page_backing(ip, vmf->page);
-+		error = alloc_page_backing(ip, index);
- 		if (error) {
--                        /*
--                         * VM_FAULT_LOCKED should always be the case for
--                         * filemap_fault, but it may not be in a future
--                         * implementation.
--                         */
--			if (ret & VM_FAULT_LOCKED)
--				unlock_page(vmf->page);
--			page_cache_release(vmf->page);
--			ret = VM_FAULT_OOM;
--			goto out_unlock;
-+			page_cache_release(result);
-+			result = NULL;
-+			goto out;
- 		}
--		set_page_dirty(vmf->page);
-+		set_page_dirty(result);
- 	}
- 
- 	pfault_be_greedy(ip);
- 
-- out_unlock:
--	gfs_glock_dq_uninit(&i_gh);
-  out:
--	return ret;
-+	gfs_glock_dq_uninit(&i_gh);
-+
-+	return result;
- }
- 
- struct vm_operations_struct gfs_vm_ops_private = {
--	.fault = gfs_private_fault,
-+	.nopage = gfs_private_nopage,
- };
- 
- struct vm_operations_struct gfs_vm_ops_sharewrite = {
--	.fault = gfs_sharewrite_fault,
-+	.nopage = gfs_sharewrite_nopage,
- };
- 
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-before-2.6.24.diff b/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-before-2.6.24.diff
deleted file mode 100644
index c77113a3dcee..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-before-2.6.24.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -uNr cluster-2.02.00.orig/gfs-kernel/src/gfs/ops_export.c cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_export.c
---- cluster-2.02.00.orig/gfs-kernel/src/gfs/ops_export.c	2008-02-26 16:37:43.000000000 +0100
-+++ cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_export.c	2008-03-21 03:01:29.000000000 +0100
-@@ -44,6 +44,49 @@
- };
- 
- /**
-+ * gfs_decode_fh -
-+ * @param1: description
-+ * @param2: description
-+ * @param3: description
-+ *
-+ * Function description
-+ *
-+ * Returns: what is returned
-+ */
-+
-+struct dentry *
-+gfs_decode_fh(struct super_block *sb, __u32 *fh, int fh_len, int fh_type,
-+	      int (*acceptable)(void *context, struct dentry *dentry),
-+	      void *context)
-+{
-+	struct inode_cookie this, parent;
-+
-+	atomic_inc(&get_v2sdp(sb)->sd_ops_export);
-+
-+	memset(&parent, 0, sizeof(struct inode_cookie));
-+
-+	switch (fh_type) {
-+	case 6:
-+		parent.gen_valid = TRUE;
-+		parent.gen = gfs32_to_cpu(fh[5]);
-+	case 5:
-+		parent.formal_ino = ((uint64_t)gfs32_to_cpu(fh[3])) << 32;
-+		parent.formal_ino |= (uint64_t)gfs32_to_cpu(fh[4]);
-+	case 3:
-+		this.gen_valid = TRUE;
-+		this.gen = gfs32_to_cpu(fh[2]);
-+		this.formal_ino = ((uint64_t)gfs32_to_cpu(fh[0])) << 32;
-+		this.formal_ino |= (uint64_t)gfs32_to_cpu(fh[1]);
-+		break;
-+	default:
-+		return NULL;
-+	}
-+
-+	return gfs_export_ops.find_exported_dentry(sb, &this, &parent,
-+						   acceptable, context);
-+}
-+
-+/**
-  * gfs_encode_fh -
-  * @param1: description
-  * @param2: description
-@@ -247,9 +290,10 @@
-  */
- 
- struct dentry *
--gfs_get_dentry(struct super_block *sb, struct inode_cookie *cookie)
-+gfs_get_dentry(struct super_block *sb, void *inump)
- {
- 	struct gfs_sbd *sdp = get_v2sdp(sb);
-+	struct inode_cookie *cookie = (struct inode_cookie *)inump;
- 	struct gfs_inum inum;
- 	struct gfs_holder i_gh, ri_gh, rgd_gh;
- 	struct gfs_rgrpd *rgd;
-@@ -362,55 +406,11 @@
- 	return ERR_PTR(error);
- }
- 
--static struct dentry *gfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
--		int fh_len, int fh_type)
--{
--	struct inode_cookie this;
--	__u32 *fh = fid->raw;
--
--	atomic_inc(&get_v2sdp(sb)->sd_ops_export);
--
--	switch (fh_type) {
--	case 6:
--	case 5:
--	case 3:
--		this.gen_valid = TRUE;
--		this.gen = gfs32_to_cpu(fh[2]);
--		this.formal_ino = ((uint64_t)gfs32_to_cpu(fh[0])) << 32;
--		this.formal_ino |= (uint64_t)gfs32_to_cpu(fh[1]);
--		return gfs_get_dentry(sb, &this);
--	default:
--		return NULL;
--	}
--}
--
--static struct dentry *gfs_fh_to_parent(struct super_block *sb, struct fid *fid,
--		int fh_len, int fh_type)
--{
--	struct inode_cookie parent;
--	__u32 *fh = fid->raw;
--
--	atomic_inc(&get_v2sdp(sb)->sd_ops_export);
--
--	switch (fh_type) {
--	case 6:
--		parent.gen_valid = TRUE;
--		parent.gen = gfs32_to_cpu(fh[5]);
--	case 5:
--		parent.formal_ino = ((uint64_t)gfs32_to_cpu(fh[3])) << 32;
--		parent.formal_ino |= (uint64_t)gfs32_to_cpu(fh[4]);
--	default:
--		return NULL;
--	}
--
--	return gfs_get_dentry(sb, &parent);
--}
--
--const struct export_operations gfs_export_ops = {
-+struct export_operations gfs_export_ops = {
-+	.decode_fh = gfs_decode_fh,
- 	.encode_fh = gfs_encode_fh,
--	.fh_to_dentry = gfs_fh_to_dentry,
--	.fh_to_parent = gfs_fh_to_parent,
- 	.get_name = gfs_get_name,
- 	.get_parent = gfs_get_parent,
-+	.get_dentry = gfs_get_dentry,
- };
- 
-diff -uNr cluster-2.02.00.orig/gfs-kernel/src/gfs/ops_export.h cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_export.h
---- cluster-2.02.00.orig/gfs-kernel/src/gfs/ops_export.h	2008-02-26 16:37:43.000000000 +0100
-+++ cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_export.h	2008-03-21 03:01:29.000000000 +0100
-@@ -14,6 +14,6 @@
- #ifndef __OPS_EXPORT_DOT_H__
- #define __OPS_EXPORT_DOT_H__
- 
--extern const struct export_operations gfs_export_ops;
-+extern struct export_operations gfs_export_ops;
- 
- #endif /* __OPS_EXPORT_DOT_H__ */
-diff -uNr cluster-2.02.00.orig/gfs-kernel/src/gfs/ops_vm.c cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_vm.c
---- cluster-2.02.00.orig/gfs-kernel/src/gfs/ops_vm.c	2008-02-26 16:37:43.000000000 +0100
-+++ cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/ops_vm.c	2008-03-21 03:01:29.000000000 +0100
-@@ -94,10 +94,9 @@
-  */
- 
- static int
--alloc_page_backing(struct gfs_inode *ip, struct page *page)
-+alloc_page_backing(struct gfs_inode *ip, unsigned long index)
- {
- 	struct gfs_sbd *sdp = ip->i_sbd;
--	unsigned long index = page->index;
- 	uint64_t lblock = index << (PAGE_CACHE_SHIFT - sdp->sd_sb.sb_bsize_shift);
- 	unsigned int blocks = PAGE_CACHE_SIZE >> sdp->sd_sb.sb_bsize_shift;
- 	struct gfs_alloc *al;
-@@ -180,7 +179,8 @@
- 				struct vm_fault *vmf)
- {
- 	struct file *file = vma->vm_file;
--	struct gfs_inode *ip = get_v2ip(file->f_mapping->host);
-+	struct gfs_file *gf = file->private_data;
-+	struct gfs_inode *ip = get_v2ip(vma->vm_file->f_mapping->host);
- 	struct gfs_holder i_gh;
- 	int alloc_required;
- 	int error;
-diff -uNr cluster-2.02.00.orig/gfs-kernel/src/gfs/sys.c cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/sys.c
---- cluster-2.02.00.orig/gfs-kernel/src/gfs/sys.c	2008-02-26 16:37:43.000000000 +0100
-+++ cluster-2.02.00-2.6.23/gfs-kernel/src/gfs/sys.c	2008-03-21 03:01:29.000000000 +0100
-@@ -86,6 +86,7 @@
- };
- 
- static struct kset gfs_kset = {
-+	.kobj   = {.name = "gfs",},
- 	.ktype  = &gfs_ktype,
- };
- 
-@@ -119,7 +120,6 @@
- {
- 	gfs_sys_margs = NULL;
- 	spin_lock_init(&gfs_sys_margs_lock);
--	kobject_set_name(&gfs_kset.kobj, "gfs");
- 	kobj_set_kset_s(&gfs_kset, fs_subsys);
- 	return kset_register(&gfs_kset);
- }
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-locking-symbol.patch b/sys-cluster/gfs-kernel/files/gfs-kernel-locking-symbol.patch
deleted file mode 100644
index cb2d6ca4fe9b..000000000000
--- a/sys-cluster/gfs-kernel/files/gfs-kernel-locking-symbol.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -uNr linux-2.6.23-gentoo-r8.orig/fs/gfs2/locking.c linux-2.6.23-gentoo-r8/fs/gfs2/locking.c
---- linux-2.6.23-gentoo-r8.orig/fs/gfs2/locking.c	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23-gentoo-r8/fs/gfs2/locking.c	2008-02-17 17:26:23.000000000 +0100
-@@ -182,3 +182,6 @@
- EXPORT_SYMBOL_GPL(gfs2_register_lockproto);
- EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto);
- 
-+EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto);
-+EXPORT_SYMBOL_GPL(gfs2_mount_lockproto);
-+EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto);
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild
deleted file mode 100644
index 596b37611e98..000000000000
--- a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild,v 1.9 2008/03/17 17:23:01 xmerlin Exp $
-
-inherit eutils linux-mod linux-info
-
-CVS_RELEASE="20060714"
-MY_P="cluster-${PV}"
-
-DESCRIPTION="GFS kernel module"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
-	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-IUSE=""
-
-DEPEND=">=virtual/linux-sources-2.6.16
-	>=sys-cluster/dlm-headers-1.02.00-r1
-	>=sys-cluster/cman-headers-1.02.00-r1"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	case ${KV_FULL} in
-		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}"/gfs-kernel-1.02.00-20060714-cvs-part1.patch || die
-	if kernel_is 2 6; then
-		if [ "$KV_PATCH" -gt "16" ] ; then
-			epatch "${WORKDIR}"/gfs-kernel-1.02.00-20060714-cvs-part2.patch || die
-		fi
-	fi
-	epatch "${FILESDIR}"/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-compile.patch || die
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" module_dir="${D}"/lib/modules/${KV_FULL} install || die "install problem"
-	rm -f "${D}"/usr/include/linux/* || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r2.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r2.ebuild
deleted file mode 100644
index 49a92684dba9..000000000000
--- a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r2.ebuild,v 1.2 2008/03/17 17:23:01 xmerlin Exp $
-
-inherit eutils linux-mod linux-info
-
-CLUSTER_RELEASE="1.02.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-CVS_RELEASE="20060714"
-
-DESCRIPTION="GFS kernel module"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
-	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-DEPEND=">=virtual/linux-sources-2.6.16
-	=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	case ${KV_FULL} in
-		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}"/gfs-kernel-1.02.00-20060714-cvs-part1.patch || die
-	if kernel_is 2 6; then
-		if [ "$KV_PATCH" -gt "16" ] ; then
-			epatch "${WORKDIR}"/gfs-kernel-1.02.00-20060714-cvs-part2.patch || die
-		fi
-
-		if [ "$KV_PATCH" -ge "18" ] ; then
-			epatch "${FILESDIR}"/${PN}-1.03.00-post-2.6.18.patch || die
-
-			sed -i \
-				-e 's|version.h|utsrelease.h|g' \
-				configure \
-				|| die "sed failed"
-		fi
-	fi
-
-	epatch "${FILESDIR}"/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-compile.patch || die
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" module_dir="${D}"/lib/modules/${KV_FULL} install || die "install problem"
-	rm -f "${D}"/usr/include/linux/* || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.03.00-r1.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.03.00-r1.ebuild
deleted file mode 100644
index ead905bf7384..000000000000
--- a/sys-cluster/gfs-kernel/gfs-kernel-1.03.00-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.03.00-r1.ebuild,v 1.3 2008/03/17 17:23:01 xmerlin Exp $
-
-inherit eutils linux-mod linux-info
-
-CLUSTER_RELEASE="1.03.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="GFS kernel module"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-IUSE=""
-
-DEPEND=">=virtual/linux-sources-2.6.16
-	=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	case ${KV_FULL} in
-		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if kernel_is 2 6; then
-		if [ "$KV_PATCH" -lt "17" ] ; then
-			epatch "${FILESDIR}"/gfs-kernel-1.03.00-pre2.6.17-compilefix.patch || die
-		fi
-
-		if [ "$KV_PATCH" -ge "18" ] ; then
-			epatch "${FILESDIR}"/${P}-post-2.6.18.patch || die
-
-			sed -i \
-				-e 's|version.h|utsrelease.h|g' \
-				configure \
-				|| die "sed failed"
-		fi
-	fi
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" module_dir="${D}"/lib/modules/${KV_FULL} install || die "install problem"
-	rm -f "${D}"/usr/include/linux/* || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild
deleted file mode 100644
index ab4a00590f24..000000000000
--- a/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.04.00-r1.ebuild,v 1.1 2008/02/08 14:48:35 caleb Exp $
-
-inherit eutils linux-mod linux-info
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="GFS kernel module"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-DEPEND=">=virtual/linux-sources-2.6.17
-	=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	case ${KV_FULL} in
-		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if kernel_is 2 6; then
-		if [ "$KV_PATCH" -ge "18" ] ; then
-			epatch "${FILESDIR}"/${P}-post2.6.17-compilefix.patch ||	die
-		fi
-		if [ "$KV_PATCH" -ge "22" ] ; then
-			epatch "${FILESDIR}"/${P}-post2.6.22-compilefix.patch ||  die
-		fi
-		if [ "$KV_PATCH" -lt "18" ] ; then
-			sed -i \
-				-e 's|utsrelease.h|version.h|g' \
-				configure \
-				|| die "sed failed"
-
-			sed -i \
-				-e 's|init_utsname()->nodename|system_utsname.nodename|g' \
-				src/gulm/gulm_fs.c \
-				|| die "sed failed"
-		fi
-	fi
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" module_dir="${D}"/lib/modules/${KV_FULL} install || die "install problem"
-	rm -f "${D}"/usr/include/linux/* || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.04.00.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.04.00.ebuild
deleted file mode 100644
index 7e2257ffeaa5..000000000000
--- a/sys-cluster/gfs-kernel/gfs-kernel-1.04.00.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.04.00.ebuild,v 1.3 2008/03/17 17:23:01 xmerlin Exp $
-
-inherit eutils linux-mod linux-info
-
-CLUSTER_RELEASE="1.04.00"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-DESCRIPTION="GFS kernel module"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-DEPEND=">=virtual/linux-sources-2.6.17
-	=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	case ${KV_FULL} in
-		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if kernel_is 2 6; then
-		if [ "$KV_PATCH" -lt "18" ] ; then
-			sed -i \
-				-e 's|utsrelease.h|version.h|g' \
-				configure \
-				|| die "sed failed"
-
-			sed -i \
-				-e 's|init_utsname()->nodename|system_utsname.nodename|g' \
-				src/gulm/gulm_fs.c \
-				|| die "sed failed"
-		fi
-	fi
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" module_dir="${D}"/lib/modules/${KV_FULL} install || die "install problem"
-	rm -f "${D}"/usr/include/linux/* || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-2.03.09.ebuild
index 18bd7a40fd0d..0097827266f0 100644
--- a/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild
+++ b/sys-cluster/gfs-kernel/gfs-kernel-2.03.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild,v 1.4 2008/03/21 22:50:08 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-2.03.09.ebuild,v 1.1 2008/11/13 23:36:42 xmerlin Exp $
 
 inherit eutils linux-mod linux-info versionator
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-DEPEND=">=virtual/linux-sources-2.6.20"
+DEPEND=">=virtual/linux-sources-2.6.27"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -56,8 +56,6 @@ src_compile() {
 			--cflags="-Wall" \
 			--kernel_src="${KERNEL_DIR}" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
 	) || die "configure problem"
 
 	(cd "${S}"/src/gfs;