cluster: STABLE3 - gfs: Make gfs build with newer kernels

[Fabio M. Di Nitto]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        e0304397b1c97f98cb5c82293986944c175ae04c
Parent:        698c7e6f146d538b380463b9a5cbd4ba12d9d0d8
Author:        Steven Whitehouse <swhiteho(a)redhat.com&gt;
AuthorDate:    Wed Jul 29 15:21:27 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto(a)redhat.com&gt;
CommitterDate: Wed Sep 23 18:14:28 2009 +0200

gfs: Make gfs build with newer kernels

Now builds with the latest upstream kernel: 2.6.31-rc4

Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com&gt;
---
 gfs-kernel/src/gfs/acl.c        |    1 +
 gfs-kernel/src/gfs/ops_file.c   |    2 +-
 gfs-kernel/src/gfs/ops_fstype.c |    4 ++--
 gfs-kernel/src/gfs/proc.c       |    1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

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/ops_file.c b/gfs-kernel/src/gfs/ops_file.c
index e5b6c4c..fa72924 100644
--- a/gfs-kernel/src/gfs/ops_file.c
+++ b/gfs-kernel/src/gfs/ops_file.c
@@ -352,7 +352,7 @@ do_read_direct(struct file *file, char *buf, size_t size, loff_t
*offset,
 		goto out_gunlock;
 
 	if (gfs_is_stuffed(ip)) {
-		size_t mask = bdev_hardsect_size(inode->i_sb->s_bdev) - 1;
+		size_t mask = bdev_logical_block_size(inode->i_sb->s_bdev) - 1;
 
 		if (((*offset) & mask) || (((unsigned long)buf) & mask))
 			goto out_gunlock;
diff --git a/gfs-kernel/src/gfs/ops_fstype.c b/gfs-kernel/src/gfs/ops_fstype.c
index 93bf4d1..d72b74a 100644
--- a/gfs-kernel/src/gfs/ops_fstype.c
+++ b/gfs-kernel/src/gfs/ops_fstype.c
@@ -300,9 +300,9 @@ static int init_sb(struct gfs_sbd *sdp, int silent, int undo)
 	      sizes, version #s, locations of important on-disk inodes, etc.  */
 
 	error = -EINVAL;
-	if (sdp->sd_sb.sb_bsize < bdev_hardsect_size(sb->s_bdev)) {
+	if (sdp->sd_sb.sb_bsize < bdev_logical_block_size(sb->s_bdev)) {
 		printk("GFS: fsid=%s: FS block size (%u) is too small for device block size
(%u)\n",
-		       sdp->sd_fsname, sdp->sd_sb.sb_bsize, bdev_hardsect_size(sb->s_bdev));
+		       sdp->sd_fsname, sdp->sd_sb.sb_bsize,
bdev_logical_block_size(sb->s_bdev));
 		goto fail;
 	}
 	if (sdp->sd_sb.sb_bsize > PAGE_SIZE) {
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;