[Cluster-devel] cluster/gfs2/libgfs2 fs_ops.c

[rpeterso at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rpeterso at sourceware.org	2007-06-22 20:50:44

Modified files:
	gfs2/libgfs2   : fs_ops.c 

Log message:
	Resolves: bz 245360: GFS2: userland tools have problems with small
	block sizes

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/fs_ops.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.4&r2=1.4.2.5

--- cluster/gfs2/libgfs2/fs_ops.c	2007/05/15 18:21:08	1.4.2.4
+++ cluster/gfs2/libgfs2/fs_ops.c	2007/06/22 20:50:44	1.4.2.5
@@ -195,7 +195,7 @@
 			buffer_copy_tail(bh, 0,
 					 ip->i_bh, sizeof(struct gfs2_dinode));
 
-			brelse(bh, not_updated);
+			brelse(bh, updated);
 		}
 	}
 
@@ -345,9 +345,7 @@
 	unsigned int height;
 	unsigned int end_of_metadata;
 	unsigned int x;
-	enum update_flags f;
 
-	f = not_updated;
 	*new = 0;
 	*dblock = 0;
 	if (extlen)
@@ -379,7 +377,7 @@
 
 	for (x = 0; x < end_of_metadata; x++) {
 		lookup_block(ip, bh, x, mp, create, new, dblock);
-		brelse(bh, not_updated);
+		brelse(bh, updated);
 		if (!*dblock)
 			goto out;
 
@@ -390,7 +388,6 @@
 			mh.mh_type = GFS2_METATYPE_IN;
 			mh.mh_format = GFS2_FORMAT_IN;
 			gfs2_meta_header_out(&mh, bh->b_data);
-			f = updated;
 		} else
 			bh = bread(sdp, *dblock);
 	}
@@ -420,7 +417,7 @@
 		}
 	}
 
-	brelse(bh, f);
+	brelse(bh, updated);
 
  out:
 	free(mp);