From mboxrd@z Thu Jan  1 00:00:00 1970
From: wcheng@sourceware.org <wcheng@sourceware.org>
Date: 17 Jun 2006 06:38:24 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/gfs ops_file.c ops_fstype.c
Message-ID: <20060617063824.12358.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	wcheng at sourceware.org	2006-06-17 06:38:23

Modified files:
	gfs-kernel/src/gfs: ops_file.c ops_fstype.c 

Log message:
	Sync with base kernel data structure changes:
	1. i_sem (in struct inode) is replaced by i_mutex.
	2. s_old_blocksize (in struct super_block) no longer exists.
	
	Thank to Mathieu Avila <mathieu.avila@seanodes.com> pointed this out.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_file.c.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_fstype.c.diff?cvsroot=cluster&r1=1.23&r2=1.24

--- cluster/gfs-kernel/src/gfs/ops_file.c	2006/01/09 22:25:06	1.22
+++ cluster/gfs-kernel/src/gfs/ops_file.c	2006/06/17 06:38:23	1.23
@@ -969,12 +969,12 @@
 	if (!access_ok(VERIFY_READ, buf, size))
 		RETURN(GFN_WRITE, -EFAULT);
 
-	down(&inode->i_sem);
+	down(&inode->i_mutex);
 	if (file->f_flags & O_DIRECT)
 		count = walk_vm(file, (char *)buf, size, offset, do_write_direct);
 	else
 		count = walk_vm(file, (char *)buf, size, offset, do_write_buf);
-	up(&inode->i_sem);
+	up(&inode->i_mutex);
 
 	RETURN(GFN_WRITE, count);
 }
--- cluster/gfs-kernel/src/gfs/ops_fstype.c	2006/01/09 22:25:06	1.23
+++ cluster/gfs-kernel/src/gfs/ops_fstype.c	2006/06/17 06:38:23	1.24
@@ -896,9 +896,7 @@
 
 		sb->s_flags = flags;
 		strlcpy(sb->s_id, bdevname(real, buf), sizeof(sb->s_id));
-		sb->s_old_blocksize = block_size(real);
-		sb_set_blocksize(sb, sb->s_old_blocksize);
-		set_blocksize(real, sb->s_old_blocksize);
+		sb_set_blocksize(sb, block_size(real));
 		error = fill_super(sb, data, (flags & MS_VERBOSE) ? 1 : 0);
 		if (error) {
 			up_write(&sb->s_umount);
@@ -930,7 +928,7 @@
 	ENTER(GFN_KILL_SB)
 	struct block_device *diaper = sb->s_bdev;
 	struct block_device *real = gfs_diaper_2real(diaper);
-	unsigned long bsize = sb->s_old_blocksize;
+	unsigned long bsize = block_size(real);
 
 	generic_shutdown_super(sb);
 	set_blocksize(diaper, bsize);