[Cluster-devel] [Patch 07/44] fsck.gfs2: Rename function check_leaf to check_ealeaf_block

[Cluster-devel] [Patch 07/44] fsck.gfs2: Rename function check_leaf to check_ealeaf_block

[Bob Peterson]

From a2fc75cad03602f8582a744c6a14ddae3a85cffd Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Mon, 8 Aug 2011 12:58:04 -0500
Subject: [PATCH 07/44] fsck.gfs2: Rename function check_leaf to
 check_ealeaf_block

This patch renames function check_leaf_block to check_ealeaf_block to
avoid confusion between directory leaf block handling and extended
attribute leaf block handling.

rhbz#675723
---
 gfs2/fsck/pass1.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index e2fe73c..30d6b3c 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -636,8 +636,11 @@ static int finish_eattr_indir(struct gfs2_inode *ip, int leaf_pointers,
 	return 1;
 }
 
-static int check_leaf_block(struct gfs2_inode *ip, uint64_t block, int btype,
-			    struct gfs2_buffer_head **bh, void *private)
+/* check_ealeaf_block
+ *      checks an extended attribute (not directory) leaf block
+ */
+static int check_ealeaf_block(struct gfs2_inode *ip, uint64_t block, int btype,
+			      struct gfs2_buffer_head **bh, void *private)
 {
 	struct gfs2_buffer_head *leaf_bh = NULL;
 	struct gfs2_sbd *sdp = ip->i_sbd;
@@ -728,7 +731,7 @@ static int check_extended_leaf_eattr(struct gfs2_inode *ip, uint64_t *data_ptr,
 				  gfs2_bad_block);
 		return 1;
 	}
-	error = check_leaf_block(ip, el_blk, GFS2_METATYPE_ED, &bh, private);
+	error = check_ealeaf_block(ip, el_blk, GFS2_METATYPE_ED, &bh, private);
 	if (bh)
 		brelse(bh);
 	return error;
@@ -769,7 +772,7 @@ static int check_eattr_leaf(struct gfs2_inode *ip, uint64_t block,
 				    "Attribute leaf"), gfs2_bad_block);
 		return 1;
 	}
-	return check_leaf_block(ip, block, GFS2_METATYPE_EA, bh, private);
+	return check_ealeaf_block(ip, block, GFS2_METATYPE_EA, bh, private);
 }
 
 static int check_eattr_entries(struct gfs2_inode *ip,
-- 
1.7.4.4

[Cluster-devel] [Patch 07/44] fsck.gfs2: Rename function check_leaf to check_ealeaf_block

[Steven Whitehouse]

This is another trivial one that could be pushed right away I think,

Steve.

On Thu, 2011-08-11 at 17:00 -0400, Bob Peterson wrote:
> >From a2fc75cad03602f8582a744c6a14ddae3a85cffd Mon Sep 17 00:00:00 2001
> From: Bob Peterson <rpeterso@redhat.com>
> Date: Mon, 8 Aug 2011 12:58:04 -0500
> Subject: [PATCH 07/44] fsck.gfs2: Rename function check_leaf to
>  check_ealeaf_block
> 
> This patch renames function check_leaf_block to check_ealeaf_block to
> avoid confusion between directory leaf block handling and extended
> attribute leaf block handling.
> 
> rhbz#675723
> ---
>  gfs2/fsck/pass1.c |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
> index e2fe73c..30d6b3c 100644
> --- a/gfs2/fsck/pass1.c
> +++ b/gfs2/fsck/pass1.c
> @@ -636,8 +636,11 @@ static int finish_eattr_indir(struct gfs2_inode *ip, int leaf_pointers,
>  	return 1;
>  }
>  
> -static int check_leaf_block(struct gfs2_inode *ip, uint64_t block, int btype,
> -			    struct gfs2_buffer_head **bh, void *private)
> +/* check_ealeaf_block
> + *      checks an extended attribute (not directory) leaf block
> + */
> +static int check_ealeaf_block(struct gfs2_inode *ip, uint64_t block, int btype,
> +			      struct gfs2_buffer_head **bh, void *private)
>  {
>  	struct gfs2_buffer_head *leaf_bh = NULL;
>  	struct gfs2_sbd *sdp = ip->i_sbd;
> @@ -728,7 +731,7 @@ static int check_extended_leaf_eattr(struct gfs2_inode *ip, uint64_t *data_ptr,
>  				  gfs2_bad_block);
>  		return 1;
>  	}
> -	error = check_leaf_block(ip, el_blk, GFS2_METATYPE_ED, &bh, private);
> +	error = check_ealeaf_block(ip, el_blk, GFS2_METATYPE_ED, &bh, private);
>  	if (bh)
>  		brelse(bh);
>  	return error;
> @@ -769,7 +772,7 @@ static int check_eattr_leaf(struct gfs2_inode *ip, uint64_t block,
>  				    "Attribute leaf"), gfs2_bad_block);
>  		return 1;
>  	}
> -	return check_leaf_block(ip, block, GFS2_METATYPE_EA, bh, private);
> +	return check_ealeaf_block(ip, block, GFS2_METATYPE_EA, bh, private);
>  }
>  
>  static int check_eattr_entries(struct gfs2_inode *ip,