[PATCH] ext3: More whitespace cleanups

More white space cleanups in preparation of cloning ext4 from ext3. Removing spaces that precede a tab. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] ext3: More whitespace cleanups
More white space cleanups in preparation of cloning ext4 from ext3. Removing spaces that precede a tab. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dave Kleikamp · Linus Torvalds
1 parent 7543fc7b3a
Showing 14 changed files with 48 additions and 48 deletions Side-by-side Diff
fs/ext3/acl.c
fs/ext3/balloc.c
fs/ext3/dir.c
fs/ext3/hash.c
fs/ext3/inode.c
fs/ext3/namei.c
fs/ext3/super.c
fs/jbd/checkpoint.c
fs/jbd/journal.c
fs/jbd/recovery.c
fs/jbd/transaction.c
include/linux/ext3_fs.h
include/linux/ext3_fs_i.h
include/linux/jbd.h
@@ -258,7 +258,7 @@
 		default:
 			return -EINVAL;
 	}
- 	if (acl) {
+	if (acl) {
 		value = ext3_acl_to_disk(acl, &size);
 		if (IS_ERR(value))
 			return (int)PTR_ERR(value);
@@ -40,7 +40,7 @@
  
 /**
  * ext3_get_group_desc() -- load group descriptor from disk
- * @sb: 		super block
+ * @sb:			super block
  * @block_group:	given block group
  * @bh:			pointer to the buffer head to store the block
  *			group descriptor
@@ -355,7 +355,7 @@
 		rsv->rsv_start = EXT3_RESERVE_WINDOW_NOT_ALLOCATED;
 		rsv->rsv_end = EXT3_RESERVE_WINDOW_NOT_ALLOCATED;
  
-	 	/*
+		/*
 		 * if filesystem is mounted with NORESERVATION, the goal
 		 * reservation window size is set to zero to indicate
 		 * block reservation is off
@@ -681,7 +681,7 @@
 		jbd_lock_bh_state(bh);
 		if (jh->b_committed_data)
 			start = ext3_find_next_zero_bit(jh->b_committed_data,
-						 	maxblocks, next);
+							maxblocks, next);
 		jbd_unlock_bh_state(bh);
 	}
 	return -1;
  
@@ -790,10 +790,10 @@
  * and at last, allocate the blocks by claiming the found free bit as allocated.
  *
  * To set the range of this allocation:
- * 	if there is a reservation window, only try to allocate block(s) from the
+ *	if there is a reservation window, only try to allocate block(s) from the
  *	file's own reservation window;
  *	Otherwise, the allocation range starts from the give goal block, ends at
- * 	the block group's last block.
+ *	the block group's last block.
  *
  * If we failed to allocate the desired block then we may end up crossing to a
  * new bitmap.  In that case we must release write access to the old one via
  
@@ -880,12 +880,12 @@
 }
  
 /**
- * 	find_next_reservable_window():
+ *	find_next_reservable_window():
  *		find a reservable space within the given range.
  *		It does not allocate the reservation window for now:
  *		alloc_new_reservation() will do the work later.
  *
- * 	@search_head: the head of the searching list;
+ *	@search_head: the head of the searching list;
  *		This is not necessarily the list head of the whole filesystem
  *
  *		We have both head and start_block to assist the search
  
  
@@ -893,12 +893,12 @@
  *		but we will shift to the place where start_block is,
  *		then start from there, when looking for a reservable space.
  *
- * 	@size: the target new reservation window size
+ *	@size: the target new reservation window size
  *
- * 	@group_first_block: the first block we consider to start
+ *	@group_first_block: the first block we consider to start
  *			the real search from
  *
- * 	@last_block:
+ *	@last_block:
  *		the maximum block number that our goal reservable space
  *		could start from. This is normally the last block in this
  *		group. The search will end when we found the start of next
@@ -906,10 +906,10 @@
  *		This could handle the cross boundary reservation window
  *		request.
  *
- * 	basically we search from the given range, rather than the whole
- * 	reservation double linked list, (start_block, last_block)
- * 	to find a free region that is of my size and has not
- * 	been reserved.
+ *	basically we search from the given range, rather than the whole
+ *	reservation double linked list, (start_block, last_block)
+ *	to find a free region that is of my size and has not
+ *	been reserved.
  *
  */
 static int find_next_reservable_window(
@@ -962,7 +962,7 @@
 			/*
 			 * Found a reserveable space big enough.  We could
 			 * have a reservation across the group boundary here
-		 	 */
+			 */
 			break;
 		}
 	}
@@ -998,7 +998,7 @@
 }
  
 /**
- * 	alloc_new_reservation()--allocate a new reservation window
+ *	alloc_new_reservation()--allocate a new reservation window
  *
  *		To make a new reservation, we search part of the filesystem
  *		reservation list (the list that inside the group). We try to
@@ -67,7 +67,7 @@
 			  unsigned long offset)
 {
 	const char * error_msg = NULL;
- 	const int rlen = le16_to_cpu(de->rec_len);
+	const int rlen = le16_to_cpu(de->rec_len);
  
 	if (rlen < EXT3_DIR_REC_LEN(1))
 		error_msg = "rec_len is smaller than minimal";
@@ -95,7 +95,7 @@
 	__u32	minor_hash = 0;
 	const char	*p;
 	int		i;
-	__u32 		in[8], buf[4];
+	__u32		in[8], buf[4];
  
 	/* Initialize the default seed for the hash checksum functions */
 	buf[0] = 0x67452301;
@@ -13,11 +13,11 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *
  *  Goal-directed block allocation by Stephen Tweedie
- * 	(sct@redhat.com), 1993, 1998
+ *	(sct@redhat.com), 1993, 1998
  *  Big-endian to little-endian byte-swapping/bitmaps by
  *        David S. Miller (davem@caip.rutgers.edu), 1995
  *  64-bit file support on 64-bit platforms by Jakub Jelinek
- * 	(jj@sunsite.ms.mff.cuni.cz)
+ *	(jj@sunsite.ms.mff.cuni.cz)
  *
  *  Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000
  */
@@ -470,7 +470,7 @@
  *	ext3_blks_to_allocate: Look up the block map and count the number
  *	of direct blocks need to be allocated for the given branch.
  *
- * 	@branch: chain of indirect blocks
+ *	@branch: chain of indirect blocks
  *	@k: number of blocks need for indirect blocks
  *	@blks: number of data blocks to be mapped.
  *	@blocks_to_boundary:  the offset in the indirect block
@@ -1098,7 +1098,7 @@
  
 	for (	bh = head, block_start = 0;
 		ret == 0 && (bh != head || !block_start);
-	    	block_start = block_end, bh = next)
+		block_start = block_end, bh = next)
 	{
 		next = bh->b_this_page;
 		block_end = block_start + blocksize;
@@ -15,13 +15,13 @@
  *  Big-endian to little-endian byte-swapping/bitmaps by
  *        David S. Miller (davem@caip.rutgers.edu), 1995
  *  Directory entry file type support and forward compatibility hooks
- *  	for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998
+ *	for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998
  *  Hash Tree Directory indexing (c)
- *  	Daniel Phillips, 2001
+ *	Daniel Phillips, 2001
  *  Hash Tree Directory indexing porting
- *  	Christopher Li, 2002
+ *	Christopher Li, 2002
  *  Hash Tree Directory indexing cleanup
- * 	Theodore Ts'o, 2002
+ *	Theodore Ts'o, 2002
  */
  
 #include <linux/fs.h>
@@ -278,7 +278,7 @@
 				       ((char *) de - base));
 			}
 			space += EXT3_DIR_REC_LEN(de->name_len);
-	 		names++;
+			names++;
 		}
 		de = (struct ext3_dir_entry_2 *) ((char *) de + le16_to_cpu(de->rec_len));
 	}
@@ -1688,7 +1688,7 @@
  
 retry:
 	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
-			 		EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
+					EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
 					2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
 	if (IS_ERR(handle))
 		return PTR_ERR(handle);
@@ -1816,7 +1816,7 @@
 			!le32_to_cpu(de1->inode) ||
 			strcmp (".", de->name) ||
 			strcmp ("..", de1->name)) {
-	    	ext3_warning (inode->i_sb, "empty_dir",
+		ext3_warning (inode->i_sb, "empty_dir",
 			      "bad directory (dir #%lu) - no `.' or `..'",
 			      inode->i_ino);
 		brelse (bh);
@@ -2129,7 +2129,7 @@
  
 retry:
 	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
-			 		EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 +
+					EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 +
 					2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
 	if (IS_ERR(handle))
 		return PTR_ERR(handle);
@@ -2227,7 +2227,7 @@
 		DQUOT_INIT(new_dentry->d_inode);
 	handle = ext3_journal_start(old_dir, 2 *
 					EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) +
-			 		EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2);
+					EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2);
 	if (IS_ERR(handle))
 		return PTR_ERR(handle);
  
@@ -734,8 +734,8 @@
  
 static ext3_fsblk_t get_sb_block(void **data)
 {
-	ext3_fsblk_t 	sb_block;
-	char 		*options = (char *) *data;
+	ext3_fsblk_t	sb_block;
+	char		*options = (char *) *data;
  
 	if (!options || strncmp(options, "sb=", 3) != 0)
 		return 1;	/* Default location */
@@ -2740,7 +2740,7 @@
 out:
 	destroy_inodecache();
 out1:
- 	exit_ext3_xattr();
+	exit_ext3_xattr();
 	return err;
 }
  
@@ -480,7 +480,7 @@
 	if (!jh)
 		return 0;
  
- 	last_jh = jh->b_cpprev;
+	last_jh = jh->b_cpprev;
 	do {
 		jh = next_jh;
 		next_jh = jh->b_cpnext;
@@ -181,7 +181,7 @@
 						transaction->t_expires))
 			should_sleep = 0;
 		if (journal->j_flags & JFS_UNMOUNT)
- 			should_sleep = 0;
+			should_sleep = 0;
 		if (should_sleep) {
 			spin_unlock(&journal->j_state_lock);
 			schedule();
@@ -314,7 +314,7 @@
 	unsigned long		next_log_block;
 	int			err, success = 0;
 	journal_superblock_t *	sb;
-	journal_header_t * 	tmp;
+	journal_header_t *	tmp;
 	struct buffer_head *	bh;
 	unsigned int		sequence;
 	int			blocktype;
@@ -580,7 +580,7 @@
 		 */
 		JBUFFER_TRACE(jh, "Unexpected dirty buffer");
 		jbd_unexpected_dirty_buffer(jh);
- 	}
+	}
  
 	unlock_buffer(bh);
  
@@ -1373,7 +1373,7 @@
 	if (handle->h_sync ||
 			transaction->t_outstanding_credits >
 				journal->j_max_transaction_buffers ||
-	    		time_after_eq(jiffies, transaction->t_expires)) {
+			time_after_eq(jiffies, transaction->t_expires)) {
 		/* Do this even for aborted journals: an abort still
 		 * completes the commit thread, it just doesn't write
 		 * anything to disk. */
@@ -1908,7 +1908,7 @@
 		next = bh->b_this_page;
  
 		if (offset <= curr_off) {
-		 	/* This block is wholly outside the truncation point */
+			/* This block is wholly outside the truncation point */
 			lock_buffer(bh);
 			may_free &= journal_unmap_buffer(journal, bh);
 			unlock_buffer(bh);
@@ -473,7 +473,7 @@
 	__u8	s_reserved_char_pad;
 	__u16	s_reserved_word_pad;
 	__le32	s_default_mount_opts;
-	__le32	s_first_meta_bg; 	/* First metablock block group */
+	__le32	s_first_meta_bg;	/* First metablock block group */
 	__u32	s_reserved[190];	/* Padding to the end of the block */
 };
  
@@ -35,7 +35,7 @@
 };
  
 struct ext3_reserve_window_node {
-	struct rb_node	 	rsv_node;
+	struct rb_node		rsv_node;
 	__u32			rsv_goal_size;
 	__u32			rsv_alloc_hit;
 	struct ext3_reserve_window	rsv_window;
@@ -64,7 +64,7 @@
 		if ((n) <= journal_enable_debug) {			\
 			printk (KERN_DEBUG "(%s, %d): %s: ",		\
 				__FILE__, __LINE__, __FUNCTION__);	\
-		  	printk (f, ## a);				\
+			printk (f, ## a);				\
 		}							\
 	} while (0)
 #else
@@ -201,9 +201,9 @@
  
 /* 0x0024 */
 	/* Remaining fields are only valid in a version-2 superblock */
-	__be32	s_feature_compat; 	/* compatible feature set */
-	__be32	s_feature_incompat; 	/* incompatible feature set */
-	__be32	s_feature_ro_compat; 	/* readonly-compatible feature set */
+	__be32	s_feature_compat;	/* compatible feature set */
+	__be32	s_feature_incompat;	/* incompatible feature set */
+	__be32	s_feature_ro_compat;	/* readonly-compatible feature set */
 /* 0x0030 */
 	__u8	s_uuid[16];		/* 128-bit uuid for journal */
  
@@ -699,7 +699,7 @@
 	wait_queue_head_t	j_wait_updates;
  
 	/* Semaphore for locking against concurrent checkpoints */
-	struct mutex	 	j_checkpoint_mutex;
+	struct mutex		j_checkpoint_mutex;
  
 	/*
 	 * Journal head: identifies the first unused block in the journal.
...	...	@@ -258,7 +258,7 @@
258	258	default:
259	259	return -EINVAL;
260	260	}
261		- if (acl) {
	261	+ if (acl) {
262	262	value = ext3_acl_to_disk(acl, &size);
263	263	if (IS_ERR(value))
264	264	return (int)PTR_ERR(value);
...	...	@@ -40,7 +40,7 @@
40	40
41	41	/**
42	42	* ext3_get_group_desc() -- load group descriptor from disk
43		- * @sb: super block
	43	+ * @sb: super block
44	44	* @block_group: given block group
45	45	* @bh: pointer to the buffer head to store the block
46	46	* group descriptor
...	...	@@ -355,7 +355,7 @@
355	355	rsv->rsv_start = EXT3_RESERVE_WINDOW_NOT_ALLOCATED;
356	356	rsv->rsv_end = EXT3_RESERVE_WINDOW_NOT_ALLOCATED;
357	357
358		- /*
	358	+ /*
359	359	* if filesystem is mounted with NORESERVATION, the goal
360	360	* reservation window size is set to zero to indicate
361	361	* block reservation is off
...	...	@@ -681,7 +681,7 @@
681	681	jbd_lock_bh_state(bh);
682	682	if (jh->b_committed_data)
683	683	start = ext3_find_next_zero_bit(jh->b_committed_data,
684		- maxblocks, next);
	684	+ maxblocks, next);
685	685	jbd_unlock_bh_state(bh);
686	686	}
687	687	return -1;
688	688
...	...	@@ -790,10 +790,10 @@
790	790	* and at last, allocate the blocks by claiming the found free bit as allocated.
791	791	*
792	792	* To set the range of this allocation:
793		- * if there is a reservation window, only try to allocate block(s) from the
	793	+ * if there is a reservation window, only try to allocate block(s) from the
794	794	* file's own reservation window;
795	795	* Otherwise, the allocation range starts from the give goal block, ends at
796		- * the block group's last block.
	796	+ * the block group's last block.
797	797	*
798	798	* If we failed to allocate the desired block then we may end up crossing to a
799	799	* new bitmap. In that case we must release write access to the old one via
800	800
...	...	@@ -880,12 +880,12 @@
880	880	}
881	881
882	882	/**
883		- * find_next_reservable_window():
	883	+ * find_next_reservable_window():
884	884	* find a reservable space within the given range.
885	885	* It does not allocate the reservation window for now:
886	886	* alloc_new_reservation() will do the work later.
887	887	*
888		- * @search_head: the head of the searching list;
	888	+ * @search_head: the head of the searching list;
889	889	* This is not necessarily the list head of the whole filesystem
890	890	*
891	891	* We have both head and start_block to assist the search
892	892
893	893
...	...	@@ -893,12 +893,12 @@
893	893	* but we will shift to the place where start_block is,
894	894	* then start from there, when looking for a reservable space.
895	895	*
896		- * @size: the target new reservation window size
	896	+ * @size: the target new reservation window size
897	897	*
898		- * @group_first_block: the first block we consider to start
	898	+ * @group_first_block: the first block we consider to start
899	899	* the real search from
900	900	*
901		- * @last_block:
	901	+ * @last_block:
902	902	* the maximum block number that our goal reservable space
903	903	* could start from. This is normally the last block in this
904	904	* group. The search will end when we found the start of next
...	...	@@ -906,10 +906,10 @@
906	906	* This could handle the cross boundary reservation window
907	907	* request.
908	908	*
909		- * basically we search from the given range, rather than the whole
910		- * reservation double linked list, (start_block, last_block)
911		- * to find a free region that is of my size and has not
912		- * been reserved.
	909	+ * basically we search from the given range, rather than the whole
	910	+ * reservation double linked list, (start_block, last_block)
	911	+ * to find a free region that is of my size and has not
	912	+ * been reserved.
913	913	*
914	914	*/
915	915	static int find_next_reservable_window(
...	...	@@ -962,7 +962,7 @@
962	962	/*
963	963	* Found a reserveable space big enough. We could
964	964	* have a reservation across the group boundary here
965		- */
	965	+ */
966	966	break;
967	967	}
968	968	}
...	...	@@ -998,7 +998,7 @@
998	998	}
999	999
1000	1000	/**
1001		- * alloc_new_reservation()--allocate a new reservation window
	1001	+ * alloc_new_reservation()--allocate a new reservation window
1002	1002	*
1003	1003	* To make a new reservation, we search part of the filesystem
1004	1004	* reservation list (the list that inside the group). We try to
...	...	@@ -67,7 +67,7 @@
67	67	unsigned long offset)
68	68	{
69	69	const char * error_msg = NULL;
70		- const int rlen = le16_to_cpu(de->rec_len);
	70	+ const int rlen = le16_to_cpu(de->rec_len);
71	71
72	72	if (rlen < EXT3_DIR_REC_LEN(1))
73	73	error_msg = "rec_len is smaller than minimal";
...	...	@@ -95,7 +95,7 @@
95	95	__u32 minor_hash = 0;
96	96	const char *p;
97	97	int i;
98		- __u32 in[8], buf[4];
	98	+ __u32 in[8], buf[4];
99	99
100	100	/* Initialize the default seed for the hash checksum functions */
101	101	buf[0] = 0x67452301;
...	...	@@ -13,11 +13,11 @@
13	13	* Copyright (C) 1991, 1992 Linus Torvalds
14	14	*
15	15	* Goal-directed block allocation by Stephen Tweedie
16		- * (sct@redhat.com), 1993, 1998
	16	+ * (sct@redhat.com), 1993, 1998
17	17	* Big-endian to little-endian byte-swapping/bitmaps by
18	18	* David S. Miller (davem@caip.rutgers.edu), 1995
19	19	* 64-bit file support on 64-bit platforms by Jakub Jelinek
20		- * (jj@sunsite.ms.mff.cuni.cz)
	20	+ * (jj@sunsite.ms.mff.cuni.cz)
21	21	*
22	22	* Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000
23	23	*/
...	...	@@ -470,7 +470,7 @@
470	470	* ext3_blks_to_allocate: Look up the block map and count the number
471	471	* of direct blocks need to be allocated for the given branch.
472	472	*
473		- * @branch: chain of indirect blocks
	473	+ * @branch: chain of indirect blocks
474	474	* @k: number of blocks need for indirect blocks
475	475	* @blks: number of data blocks to be mapped.
476	476	* @blocks_to_boundary: the offset in the indirect block
...	...	@@ -1098,7 +1098,7 @@
1098	1098
1099	1099	for ( bh = head, block_start = 0;
1100	1100	ret == 0 && (bh != head \|\| !block_start);
1101		- block_start = block_end, bh = next)
	1101	+ block_start = block_end, bh = next)
1102	1102	{
1103	1103	next = bh->b_this_page;
1104	1104	block_end = block_start + blocksize;
...	...	@@ -15,13 +15,13 @@
15	15	* Big-endian to little-endian byte-swapping/bitmaps by
16	16	* David S. Miller (davem@caip.rutgers.edu), 1995
17	17	* Directory entry file type support and forward compatibility hooks
18		- * for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998
	18	+ * for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998
19	19	* Hash Tree Directory indexing (c)
20		- * Daniel Phillips, 2001
	20	+ * Daniel Phillips, 2001
21	21	* Hash Tree Directory indexing porting
22		- * Christopher Li, 2002
	22	+ * Christopher Li, 2002
23	23	* Hash Tree Directory indexing cleanup
24		- * Theodore Ts'o, 2002
	24	+ * Theodore Ts'o, 2002
25	25	*/
26	26
27	27	#include <linux/fs.h>
...	...	@@ -278,7 +278,7 @@
278	278	((char *) de - base));
279	279	}
280	280	space += EXT3_DIR_REC_LEN(de->name_len);
281		- names++;
	281	+ names++;
282	282	}
283	283	de = (struct ext3_dir_entry_2 ) ((char ) de + le16_to_cpu(de->rec_len));
284	284	}
...	...	@@ -1688,7 +1688,7 @@
1688	1688
1689	1689	retry:
1690	1690	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
1691		- EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
	1691	+ EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
1692	1692	2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
1693	1693	if (IS_ERR(handle))
1694	1694	return PTR_ERR(handle);
...	...	@@ -1816,7 +1816,7 @@
1816	1816	!le32_to_cpu(de1->inode) \|\|
1817	1817	strcmp (".", de->name) \|\|
1818	1818	strcmp ("..", de1->name)) {
1819		- ext3_warning (inode->i_sb, "empty_dir",
	1819	+ ext3_warning (inode->i_sb, "empty_dir",
1820	1820	"bad directory (dir #%lu) - no `.' or `..'",
1821	1821	inode->i_ino);
1822	1822	brelse (bh);
...	...	@@ -2129,7 +2129,7 @@
2129	2129
2130	2130	retry:
2131	2131	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
2132		- EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 +
	2132	+ EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 +
2133	2133	2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
2134	2134	if (IS_ERR(handle))
2135	2135	return PTR_ERR(handle);
...	...	@@ -2227,7 +2227,7 @@
2227	2227	DQUOT_INIT(new_dentry->d_inode);
2228	2228	handle = ext3_journal_start(old_dir, 2 *
2229	2229	EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) +
2230		- EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2);
	2230	+ EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2);
2231	2231	if (IS_ERR(handle))
2232	2232	return PTR_ERR(handle);
2233	2233
...	...	@@ -734,8 +734,8 @@
734	734
735	735	static ext3_fsblk_t get_sb_block(void **data)
736	736	{
737		- ext3_fsblk_t sb_block;
738		- char options = (char ) *data;
	737	+ ext3_fsblk_t sb_block;
	738	+ char options = (char ) *data;
739	739
740	740	if (!options \|\| strncmp(options, "sb=", 3) != 0)
741	741	return 1; /* Default location */
...	...	@@ -2740,7 +2740,7 @@
2740	2740	out:
2741	2741	destroy_inodecache();
2742	2742	out1:
2743		- exit_ext3_xattr();
	2743	+ exit_ext3_xattr();
2744	2744	return err;
2745	2745	}
2746	2746
...	...	@@ -480,7 +480,7 @@
480	480	if (!jh)
481	481	return 0;
482	482
483		- last_jh = jh->b_cpprev;
	483	+ last_jh = jh->b_cpprev;
484	484	do {
485	485	jh = next_jh;
486	486	next_jh = jh->b_cpnext;
...	...	@@ -181,7 +181,7 @@
181	181	transaction->t_expires))
182	182	should_sleep = 0;
183	183	if (journal->j_flags & JFS_UNMOUNT)
184		- should_sleep = 0;
	184	+ should_sleep = 0;
185	185	if (should_sleep) {
186	186	spin_unlock(&journal->j_state_lock);
187	187	schedule();
...	...	@@ -314,7 +314,7 @@
314	314	unsigned long next_log_block;
315	315	int err, success = 0;
316	316	journal_superblock_t * sb;
317		- journal_header_t * tmp;
	317	+ journal_header_t * tmp;
318	318	struct buffer_head * bh;
319	319	unsigned int sequence;
320	320	int blocktype;