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

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-06-28 15:58:11

Modified files:
	gfs-kernel/src/gfs: ops_address.c 

Log message:
	2.6.17 adjustments

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_address.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.5.2.1.4.2&r2=1.5.2.1.4.2.2.1

--- cluster/gfs-kernel/src/gfs/ops_address.c	2005/05/11 23:19:59	1.5.2.1.4.2
+++ cluster/gfs-kernel/src/gfs/ops_address.c	2006/06/28 15:58:11	1.5.2.1.4.2.2.1
@@ -451,7 +451,7 @@
 	struct inode *inode = file->f_mapping->host;
 	struct gfs_inode *ip = get_v2ip(inode);
 	struct gfs_sbd *sdp = ip->i_sbd;
-	get_blocks_t *gb = get_blocks;
+	get_block_t *gb = get_blocks;
 
 	atomic_inc(&sdp->sd_ops_address);
 
@@ -460,7 +460,7 @@
 		return -EINVAL;
 
 	if (rw == WRITE && !get_transaction)
-		gb = get_blocks_noalloc;
+		gb = get_block_noalloc;
 
 	return blockdev_direct_IO(rw, iocb, inode,
 				  inode->i_sb->s_bdev, iov,