[Cluster-devel] cluster/gfs2/fsck pass1.c

[Cluster-devel] cluster/gfs2/fsck pass1.c

[rpeterso]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rpeterso at sourceware.org	2007-03-26 20:16:11

Modified files:
	gfs2/fsck      : pass1.c 

Log message:
	Resolves: Bugzilla Bug 232019: gfs2_fsck doesn't fix an ea problem.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/pass1.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.1&r2=1.4.2.2

--- cluster/gfs2/fsck/pass1.c	2007/01/23 19:30:19	1.4.2.1
+++ cluster/gfs2/fsck/pass1.c	2007/03/26 19:16:11	1.4.2.2
@@ -287,8 +287,8 @@
 }
 
 static int check_eattr_leaf(struct gfs2_inode *ip, uint64_t block,
-							uint64_t parent, struct gfs2_buffer_head **bh,
-							void *private)
+			    uint64_t parent, struct gfs2_buffer_head **bh,
+			    void *private)
 {
 	struct gfs2_sbd *sdp = ip->i_sbd;
 	struct gfs2_buffer_head *leaf_bh;
@@ -324,10 +324,13 @@
 	else {
 		leaf_bh = bread(sdp, block);
 		if(gfs2_check_meta(leaf_bh, GFS2_METATYPE_EA)) {
-			log_warn("EA leaf block has incorrect type.\n");
+			log_warn("EA leaf block %"PRIu64" (0x%" 
+				 PRIx64") for inode %"PRIu64" (0x%"
+				 PRIx64") has incorrect type.\n",
+				 block, block, ip->i_di.di_num.no_addr,
+				 ip->i_di.di_num.no_addr);
 			gfs2_block_set(bl, block, gfs2_meta_inval);
-			brelse(leaf_bh, not_updated);
-			ret = 1;
+			ret = -1;
 		}
 		else {
 			log_debug("Setting block %" PRIu64 " (0x%" PRIx64

[Cluster-devel] cluster/gfs2/fsck pass1.c

[rpeterso]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso at sourceware.org	2007-03-26 20:14:03

Modified files:
	gfs2/fsck      : pass1.c 

Log message:
	Resolves: Bugzilla Bug 232019: gfs2_fsck doesn't fix an ea problem.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/pass1.c.diff?cvsroot=cluster&r1=1.5&r2=1.6

--- cluster/gfs2/fsck/pass1.c	2007/01/23 19:23:07	1.5
+++ cluster/gfs2/fsck/pass1.c	2007/03/26 19:14:03	1.6
@@ -287,8 +287,8 @@
 }
 
 static int check_eattr_leaf(struct gfs2_inode *ip, uint64_t block,
-							uint64_t parent, struct gfs2_buffer_head **bh,
-							void *private)
+			    uint64_t parent, struct gfs2_buffer_head **bh,
+			    void *private)
 {
 	struct gfs2_sbd *sdp = ip->i_sbd;
 	struct gfs2_buffer_head *leaf_bh;
@@ -324,10 +324,13 @@
 	else {
 		leaf_bh = bread(sdp, block);
 		if(gfs2_check_meta(leaf_bh, GFS2_METATYPE_EA)) {
-			log_warn("EA leaf block has incorrect type.\n");
+			log_warn("EA leaf block %"PRIu64" (0x%" 
+				 PRIx64") for inode %"PRIu64" (0x%"
+				 PRIx64") has incorrect type.\n",
+				 block, block, ip->i_di.di_num.no_addr,
+				 ip->i_di.di_num.no_addr);
 			gfs2_block_set(bl, block, gfs2_meta_inval);
-			brelse(leaf_bh, not_updated);
-			ret = 1;
+			ret = -1;
 		}
 		else {
 			log_debug("Setting block %" PRIu64 " (0x%" PRIx64