cluster: STABLE3 - gfs-kernel: update to 2.6.30

cluster: STABLE3 - gfs-kernel: update to 2.6.30

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=38111441a822d898c749491ee59580250e0f6c98
Commit:        38111441a822d898c749491ee59580250e0f6c98
Parent:        e91e2b145a40703e07f5322699a17c68f009e150
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Mon Aug 10 08:28:23 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon Aug 10 08:28:23 2009 +0200

gfs-kernel: update to 2.6.30

Origina patch by Steven Whitehouse for 2.6.31-rc

Ported to 2.6.30 by Marc - A. Dahlhaus [ Administration | Westermann GmbH ]

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 configure                 |    2 +-
 gfs-kernel/src/gfs/acl.c  |    1 +
 gfs-kernel/src/gfs/proc.c |    1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 765bff7..1a60cab 100755
--- a/configure
+++ b/configure
@@ -17,7 +17,7 @@ my $ret = 0;
 
 # this should be only the major version without the extra version 
 # eg. only the first 3 digits
-my $required_kernelversion = '2.6.29';
+my $required_kernelversion = '2.6.30';
 
 my %options = (
 	help => \$help,
diff --git a/gfs-kernel/src/gfs/acl.c b/gfs-kernel/src/gfs/acl.c
index a9312ba..3936baa 100644
--- a/gfs-kernel/src/gfs/acl.c
+++ b/gfs-kernel/src/gfs/acl.c
@@ -1,4 +1,5 @@
 #include <linux/sched.h>
+#include <linux/fs_struct.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
diff --git a/gfs-kernel/src/gfs/proc.c b/gfs-kernel/src/gfs/proc.c
index b25cd1c..069b39d 100644
--- a/gfs-kernel/src/gfs/proc.c
+++ b/gfs-kernel/src/gfs/proc.c
@@ -470,7 +470,6 @@ gfs_proc_init(void)
 	if (!pde)
 		return -ENOMEM;
 
-	pde->owner = THIS_MODULE;
 	pde->proc_fops = &gfs_proc_fops;
 
 	return 0;