commit 1b06b8a4e4f9b36566b6ea15a094243ae06dc0e2
Author: Bob Peterson <bob@ganesha.peterson>
Date:   Tue Jan 26 14:11:52 2010 -0600

    Fix white space errors
    
    This patch cleans up some whitespace issues with the previous 57 patches.
    
    rhbz#455300

diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index fac5fec..3a9905e 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -425,7 +425,7 @@ static int adjust_indirect_blocks(struct gfs2_sbd *sbp, struct gfs2_inode *ip)
 	int error = 0, di_height;
 	struct blocklist blocks, *blk, *newblk;
 	struct metapath gfs2mp;
-	struct gfs2_buffer_head *dibh = ip->i_bh;			   
+	struct gfs2_buffer_head *dibh = ip->i_bh;
 
 	/* if there are no indirect blocks to check */
 	if (ip->i_di.di_height <= 1)
diff --git a/gfs2/fsck/lost_n_found.c b/gfs2/fsck/lost_n_found.c
index ed12f13..7d65fe0 100644
--- a/gfs2/fsck/lost_n_found.c
+++ b/gfs2/fsck/lost_n_found.c
@@ -179,7 +179,7 @@ int add_inode_to_lf(struct gfs2_inode *ip){
 		reprocess_inode(lf_dip, "lost+found");
 
 	/* This inode is linked from lost+found */
-  	increment_link(ip->i_di.di_num.no_addr, lf_dip->i_di.di_num.no_addr,
+	increment_link(ip->i_di.di_num.no_addr, lf_dip->i_di.di_num.no_addr,
 		       _("from lost+found"));
 	/* If it's a directory, lost+found is back-linked to it via .. */
 	if(S_ISDIR(ip->i_di.di_mode))
diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c
index 6939437..5bcfb02 100644
--- a/gfs2/fsck/metawalk.c
+++ b/gfs2/fsck/metawalk.c
@@ -1232,8 +1232,8 @@ fail:
  *              This does not include "data" blocks that are really
  *              hash table blocks for directories.
  *
- * @ip: 
- * 
+ * @ip:
+ *
  * returns: +ENOENT if there are too many bad pointers
  *          -1 if a more serious error occurred.
  *          0 if no errors occurred
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index f85b1a2..cc3ca9f 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -159,7 +159,7 @@ static int check_metalist(struct gfs2_inode *ip, uint64_t block,
 		log_err( _("Found duplicate block %llu (0x%llx) referenced "
 			   "as metadata in indirect block for dinode "
 			   "%llu (0x%llx) - was marked %d (%s)\n"),
- 			 (unsigned long long)block,
+			 (unsigned long long)block,
 			 (unsigned long long)block,
 			 (unsigned long long)ip->i_di.di_num.no_addr,
 			 (unsigned long long)ip->i_di.di_num.no_addr, q,
@@ -222,7 +222,7 @@ static int undo_check_metalist(struct gfs2_inode *ip, uint64_t block,
 		log_err( _("Reversing duplicate status of block %llu (0x%llx) "
 			   "referenced as metadata in indirect block for "
 			   "dinode %llu (0x%llx)\n"),
- 			 (unsigned long long)block,
+			 (unsigned long long)block,
 			 (unsigned long long)block,
 			 (unsigned long long)ip->i_di.di_num.no_addr,
 			 (unsigned long long)ip->i_di.di_num.no_addr);
diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c
index af814ae..e00294a 100644
--- a/gfs2/fsck/pass1b.c
+++ b/gfs2/fsck/pass1b.c
@@ -549,7 +549,7 @@ static int handle_dup_blk(struct gfs2_sbd *sbp, struct duptree *b)
 		log_inode_reference(b, tmp, 1);
 	osi_list_foreach(tmp, &b->ref_inode_list)
 		log_inode_reference(b, tmp, 0);
-	
+
 	last_reference = clear_a_reference(sbp, b, &b->ref_invinode_list,
 					   &dh, 1);
 	if (!last_reference)
@@ -606,7 +606,6 @@ static int handle_dup_blk(struct gfs2_sbd *sbp, struct duptree *b)
 		log_debug( _("All duplicate references were resolved.\n"));
 	}
 	return 0;
-
 }
 
 /* Pass 1b handles finding the previous inode for a duplicate block
diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c
index effbfa6..2068802 100644
--- a/gfs2/fsck/pass2.c
+++ b/gfs2/fsck/pass2.c
@@ -240,7 +240,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent,
 		log_err( _("Bad directory entry deleted.\n"));
 		return 1;
 	}
-	
+
 	calculated_hash = gfs2_disk_hash(tmp_name, de->de_name_len);
 	if (de->de_hash != calculated_hash){
 	        log_err( _("Dir entry with bad hash or name length\n"
diff --git a/gfs2/fsck/util.c b/gfs2/fsck/util.c
index a9dce7b..3154979 100644
--- a/gfs2/fsck/util.c
+++ b/gfs2/fsck/util.c
@@ -173,7 +173,7 @@ int fsck_query(const char *format, ...)
 			errors_corrected++;
                         ret = 1;
                         break;
- 		} else if (tolower(response) == 'n') {
+		} else if (tolower(response) == 'n') {
 			ret = 0;
 			break;
 		} else {
diff --git a/gfs2/include/osi_tree.h b/gfs2/include/osi_tree.h
index 4ffae94..f0d0768 100644
--- a/gfs2/include/osi_tree.h
+++ b/gfs2/include/osi_tree.h
@@ -329,7 +329,7 @@ static inline struct osi_node *osi_next(struct osi_node *node)
 	/* If we have a right-hand child, go down and then left as far
 	   as we can. */
 	if (node->osi_right) {
-		node = node->osi_right; 
+		node = node->osi_right;
 		while (node->osi_left)
 			node=node->osi_left;
 		return node;
@@ -354,7 +354,7 @@ static inline struct osi_node *osi_prev(struct osi_node *node)
 	/* If we have a left-hand child, go down and then right as far
 	   as we can. */
 	if (node->osi_left) {
-		node = node->osi_left; 
+		node = node->osi_left;
 		while (node->osi_right)
 			node=node->osi_right;
 		return node;
diff --git a/gfs2/libgfs2/gfs2_log.c b/gfs2/libgfs2/gfs2_log.c
index 73d059b..e8523cf 100644
--- a/gfs2/libgfs2/gfs2_log.c
+++ b/gfs2/libgfs2/gfs2_log.c
@@ -184,9 +184,9 @@ int gfs2_query(int *setonabort, struct gfs2_options *opts,
 			}
 			printf("Continuing.\n");
 		} else if(tolower(response) == 'y') {
-                        ret = 1;
-                        break;
- 		} else if (tolower(response) == 'n') {
+			ret = 1;
+			break;
+		} else if (tolower(response) == 'n') {
 			ret = 0;
 			break;
 		} else {