Attachment 260481 Details for Bug 382581 – Better patch for HEAD

[patch] Better patch for HEAD

382581.gfs2_fsck.try2.patch (text/plain), 4.27 KB, created by Robert Peterson on 2007-11-15 22:13:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-11-15 22:13:07 UTC

Size: 4.27 KB

patch

obsolete

>Index: fsck/metawalk.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/metawalk.c,v
>retrieving revision 1.13
>diff -w -u -p -p -u -r1.13 metawalk.c
>--- fsck/metawalk.c	18 Sep 2007 18:14:04 -0000	1.13
>+++ fsck/metawalk.c	15 Nov 2007 22:04:06 -0000
>@@ -463,9 +463,11 @@ static int check_leaf_eattr(struct gfs2_
> 		if(error > 0) {
> 			return 1;
> 		}
>+		check_eattr_entries(ip, bh, pass);
>+		if (bh)
>+			brelse(bh, not_updated);
> 	}
> 
>-	check_eattr_entries(ip, bh, pass);
> 	return 0;
> }
> 
>@@ -487,7 +489,7 @@ static int check_indirect_eattr(struct g
> 	log_debug("Checking EA indirect block #%"PRIu64" (0x%" PRIx64 ").\n",
> 			  indirect, indirect);
> 
>-	if (!pass->check_eattr_indir ||
>+	if (pass->check_eattr_indir &&
> 	    !pass->check_eattr_indir(ip, indirect, ip->i_di.di_num.no_addr,
> 								 &indirect_buf, pass->private)) {
> 		ea_leaf_ptr = (uint64_t *)(indirect_buf->b_data
>Index: fsck/pass1.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass1.c,v
>retrieving revision 1.11
>diff -w -u -p -p -u -r1.11 pass1.c
>--- fsck/pass1.c	18 Sep 2007 18:14:04 -0000	1.11
>+++ fsck/pass1.c	15 Nov 2007 22:04:06 -0000
>@@ -178,6 +178,7 @@ static int check_eattr_indir(struct gfs2
> 					 ") has incorrect type.\n", block, block);
> 			gfs2_block_set(bl, block, gfs2_meta_inval);
> 			ret = 1;
>+			brelse(*bh, not_updated);
> 		}
> 		else {
> 			/* FIXME: do i need to differentiate this as an ea_indir? */
>@@ -293,6 +294,7 @@ static int check_eattr_leaf(struct gfs2_
> 				 ip->i_di.di_num.no_addr);
> 			gfs2_block_set(bl, block, gfs2_meta_inval);
> 			ret = -1;
>+			brelse(leaf_bh, not_updated);
> 		}
> 		else {
> 			log_debug("Setting block %" PRIu64 " (0x%" PRIx64
>@@ -300,7 +302,6 @@ static int check_eattr_leaf(struct gfs2_
> 			gfs2_block_set(bl, block, gfs2_meta_eattr);
> 			bc->ea_count++;
> 		}
>-		brelse(leaf_bh, not_updated);
> 	}
> 	*bh = leaf_bh;
> 
>Index: fsck/pass1c.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass1c.c,v
>retrieving revision 1.7
>diff -w -u -p -p -u -r1.7 pass1c.c
>--- fsck/pass1c.c	18 Sep 2007 18:14:04 -0000	1.7
>+++ fsck/pass1c.c	15 Nov 2007 22:04:06 -0000
>@@ -77,7 +77,6 @@ int check_eattr_leaf(struct gfs2_inode *
> 	int *update = (int *) private;
> 	struct gfs2_sbd *sbp = ip->i_sbd;
> 	struct gfs2_block_query q;
>-	struct gfs2_buffer_head *leaf_bh;
> 
> 	if(gfs2_check_range(sbp, block)) {
> 		log_err("Extended attributes block out of range...removing\n");
>@@ -96,9 +95,8 @@ int check_eattr_leaf(struct gfs2_inode *
> 		return 1;
> 	}
> 	else 
>-		leaf_bh = bread(sbp, block);
>+		*bh = bread(sbp, block);
> 
>-	*bh = leaf_bh;
> 	return 0;
> }
> 
>@@ -248,6 +246,7 @@ int pass1c(struct gfs2_sbd *sbp)
> 		error = check_inode_eattr(ip, &pass1c_fxns);
> 		if(error < 0) {
> 			stack;
>+			brelse(bh, not_updated);
> 			return -1;
> 		}
> 
>Index: fsck/pass2.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass2.c,v
>retrieving revision 1.9
>diff -w -u -p -p -u -r1.9 pass2.c
>--- fsck/pass2.c	18 Sep 2007 18:14:04 -0000	1.9
>+++ fsck/pass2.c	15 Nov 2007 22:04:06 -0000
>@@ -89,18 +89,13 @@ int set_dotdot_dir(struct gfs2_sbd *sbp,
> static int check_eattr_indir(struct gfs2_inode *ip, uint64_t block,
> 			    uint64_t parent, struct gfs2_buffer_head **bh, void *private)
> {
>-
>+	*bh = bread(ip->i_sbd, block);
> 	return 0;
> }
> static int check_eattr_leaf(struct gfs2_inode *ip, uint64_t block,
> 			    uint64_t parent, struct gfs2_buffer_head **bh, void *private)
> {
>-#if 0
>-	struct gfs2_buffer_head *leaf_bh;
>-
>-	leaf_bh = bread(ip->i_sbd, block);
>-	brelse(leaf_bh);
>-#endif
>+	*bh = bread(ip->i_sbd, block);
> 	return 0;
> }
> 
>Index: fsck/pass5.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass5.c,v
>retrieving revision 1.5
>diff -w -u -p -p -u -r1.5 pass5.c
>--- fsck/pass5.c	28 Jun 2007 23:41:37 -0000	1.5
>+++ fsck/pass5.c	15 Nov 2007 22:04:06 -0000
>@@ -81,7 +81,6 @@ int check_block_status(struct gfs2_sbd *
> 	while(byte < end) {
> 		rg_status = ((*byte >> bit) & GFS2_BIT_MASK);
> 		block = rg_data + *rg_block;
>-		log_debug("Checking block %" PRIu64 "\n", block);
> 		warm_fuzzy_stuff(block);
> 		if (skip_this_pass || fsck_abort) /* if asked to skip the rest */
> 			return 0;

Actions: View | Diff

Attachments on bug 382581: 258161 | 260481 | 261981