[Cluster-devel] cluster/gfs-kernel/src/gfs gfs.h inode.c

[Cluster-devel] cluster/gfs-kernel/src/gfs gfs.h inode.c

[cfeist]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	cfeist at sourceware.org	2006-10-05 16:04:38

Modified files:
	gfs-kernel/src/gfs: gfs.h inode.c 

Log message:
	- Added in fixes to make gfs-kmod compatible with the RHEL5 kernel
	- removed inode->i_blksize references
	- Using i_private instead of u.generic_ip in the inode struct

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/gfs.h.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/inode.c.diff?cvsroot=cluster&r1=1.25&r2=1.26

--- cluster/gfs-kernel/src/gfs/gfs.h	2006/09/20 18:48:56	1.12
+++ cluster/gfs-kernel/src/gfs/gfs.h	2006/10/05 16:04:38	1.13
@@ -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)
--- cluster/gfs-kernel/src/gfs/inode.c	2006/08/02 17:21:19	1.25
+++ cluster/gfs-kernel/src/gfs/inode.c	2006/10/05 16:04:38	1.26
@@ -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;