Attachment 273071 Details for Bug 404611 – First prototype patch

[patch] First prototype patch

404611.firstprototype.patch (text/plain), 2.30 KB, created by Robert Peterson on 2007-11-29 17:22:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-11-29 17:22:38 UTC

Size: 2.30 KB

patch

obsolete

>Index: pass1.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass1.c,v
>retrieving revision 1.13
>diff -w -u -p -p -u -r1.13 pass1.c
>--- pass1.c	29 Nov 2007 16:20:51 -0000	1.13
>+++ pass1.c	29 Nov 2007 17:18:51 -0000
>@@ -277,16 +277,32 @@ static int check_eattr_leaf(struct gfs2_
> 		stack;
> 		return -1;
> 	}
>-	else if(q.block_type != gfs2_block_free) {
>-		log_debug("Duplicate block found at #%" PRIu64 " (0x%" PRIx64 ").\n",
>-				  block, block);
>-		gfs2_block_set(bl, block, gfs2_dup_block);
>-		bc->ea_count++;
>-		ret = 1;
>-	}
> 	else {
>+		/* Special duplicate processing:  If we have an EA block,
>+		   check if it really is an EA.  If it is, let duplicate
>+		   handling sort it out.  If it isn't, clear it but don't
>+		   count it as a duplicate. */
> 		leaf_bh = bread(sdp, block);
> 		if(gfs2_check_meta(leaf_bh, GFS2_METATYPE_EA)) {
>+			if(q.block_type != gfs2_block_free) { /* Duplicate? */
>+				log_err("Inode #%" PRIu64 " (0x%" PRIx64
>+					"): Bad EA duplicate found.\n",
>+					ip->i_di.di_num.no_addr,
>+					ip->i_di.di_num.no_addr);
>+				if(query(&opts, "Clear the bad EA? (y/n) ")) {
>+					ip->i_di.di_eattr = 0;
>+					gfs2_dinode_out(&ip->i_di,
>+							ip->i_bh->b_data);
>+					ret = -1;
>+					brelse(leaf_bh, not_updated);
>+				} else {
>+					log_err("The bad EA was not fixed.\n");
>+					gfs2_block_set(bl, block,
>+						       gfs2_dup_block);
>+					bc->ea_count++;
>+					ret = 1;
>+				}
>+			} else {
> 			log_warn("EA leaf block %"PRIu64" (0x%" 
> 				 PRIx64") for inode %"PRIu64" (0x%"
> 				 PRIx64") has incorrect type.\n",
>@@ -296,13 +312,24 @@ static int check_eattr_leaf(struct gfs2_
> 			ret = -1;
> 			brelse(leaf_bh, not_updated);
> 		}
>-		else {
>-			log_debug("Setting block %" PRIu64 " (0x%" PRIx64
>-					  ") to eattr block\n", block, block);
>+		}
>+		else { /* If this looks like an EA */
>+			if(q.block_type != gfs2_block_free) { /* Duplicate? */
>+				log_debug("Duplicate block found at #%" PRIu64
>+					  " (0x%" PRIx64 ").\n",
>+					  block, block);
>+				gfs2_block_set(bl, block, gfs2_dup_block);
>+				bc->ea_count++;
>+				ret = 1;
>+			} else {
>+				log_debug("Setting block %" PRIu64
>+					  " (0x%" PRIx64 ") to eattr block\n",
>+					  block, block);
> 			gfs2_block_set(bl, block, gfs2_meta_eattr);
> 			bc->ea_count++;
> 		}
> 	}
>+	}
> 	*bh = leaf_bh;
> 
> 	return ret;

Actions: View | Diff

Attachments on bug 404611: 272991 | 273071 | 311604 | 311988 | 312174 | 312404 | 312571