Commit f5d256f8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ext3/JBD: remove trailing whitespace

ext3 and JBD still have enormous numbers of lines which end in tabs.  Fix
them all up.
parent 1ca5d490
...@@ -333,7 +333,6 @@ static int find_next_usable_block(int start, struct buffer_head *bh, ...@@ -333,7 +333,6 @@ static int find_next_usable_block(int start, struct buffer_head *bh,
return here; return here;
ext3_debug ("Bit not found near goal\n"); ext3_debug ("Bit not found near goal\n");
} }
here = start; here = start;
...@@ -690,7 +689,6 @@ ext3_new_block(handle_t *handle, struct inode *inode, unsigned long goal, ...@@ -690,7 +689,6 @@ ext3_new_block(handle_t *handle, struct inode *inode, unsigned long goal,
DQUOT_FREE_BLOCK(inode, 1); DQUOT_FREE_BLOCK(inode, 1);
brelse(bitmap_bh); brelse(bitmap_bh);
return 0; return 0;
} }
unsigned long ext3_count_free_blocks(struct super_block *sb) unsigned long ext3_count_free_blocks(struct super_block *sb)
......
...@@ -2166,7 +2166,6 @@ void ext3_truncate(struct inode * inode) ...@@ -2166,7 +2166,6 @@ void ext3_truncate(struct inode * inode)
ext3_block_truncate_page(handle, inode->i_mapping, inode->i_size); ext3_block_truncate_page(handle, inode->i_mapping, inode->i_size);
n = ext3_block_to_path(inode, last_block, offsets, NULL); n = ext3_block_to_path(inode, last_block, offsets, NULL);
if (n == 0) if (n == 0)
goto out_stop; /* error */ goto out_stop; /* error */
......
...@@ -798,8 +798,6 @@ static inline int search_dirblock(struct buffer_head * bh, ...@@ -798,8 +798,6 @@ static inline int search_dirblock(struct buffer_head * bh,
* The returned buffer_head has ->b_count elevated. The caller is expected * The returned buffer_head has ->b_count elevated. The caller is expected
* to brelse() it when appropriate. * to brelse() it when appropriate.
*/ */
static struct buffer_head * ext3_find_entry (struct dentry *dentry, static struct buffer_head * ext3_find_entry (struct dentry *dentry,
struct ext3_dir_entry_2 ** res_dir) struct ext3_dir_entry_2 ** res_dir)
{ {
......
...@@ -259,7 +259,6 @@ const char *ext3_decode_error(struct super_block * sb, int errno, char nbuf[16]) ...@@ -259,7 +259,6 @@ const char *ext3_decode_error(struct super_block * sb, int errno, char nbuf[16])
if (snprintf(nbuf, 16, "error %d", -errno) >= 0) if (snprintf(nbuf, 16, "error %d", -errno) >= 0)
errstr = nbuf; errstr = nbuf;
} }
break; break;
} }
......
...@@ -267,7 +267,6 @@ static int __flush_buffer(journal_t *journal, struct journal_head *jh, ...@@ -267,7 +267,6 @@ static int __flush_buffer(journal_t *journal, struct journal_head *jh,
return ret; return ret;
} }
/* /*
* Perform an actual checkpoint. We don't write out only enough to * Perform an actual checkpoint. We don't write out only enough to
* satisfy the current blocked requests: rather we submit a reasonably * satisfy the current blocked requests: rather we submit a reasonably
......
...@@ -175,7 +175,6 @@ int kjournald(void *arg) ...@@ -175,7 +175,6 @@ int kjournald(void *arg)
spin_unlock(&journal->j_state_lock); spin_unlock(&journal->j_state_lock);
refrigerator(PF_IOTHREAD); refrigerator(PF_IOTHREAD);
spin_lock(&journal->j_state_lock); spin_lock(&journal->j_state_lock);
jbd_debug(1, "Resuming kjournald\n");
} else { } else {
/* /*
* We assume on resume that commits are already there, * We assume on resume that commits are already there,
......
...@@ -241,7 +241,6 @@ int journal_recover(journal_t *journal) ...@@ -241,7 +241,6 @@ int journal_recover(journal_t *journal)
return 0; return 0;
} }
err = do_one_pass(journal, &info, PASS_SCAN); err = do_one_pass(journal, &info, PASS_SCAN);
if (!err) if (!err)
err = do_one_pass(journal, &info, PASS_REVOKE); err = do_one_pass(journal, &info, PASS_REVOKE);
...@@ -295,7 +294,6 @@ int journal_skip_recovery(journal_t *journal) ...@@ -295,7 +294,6 @@ int journal_skip_recovery(journal_t *journal)
#ifdef CONFIG_JBD_DEBUG #ifdef CONFIG_JBD_DEBUG
int dropped = info.end_transaction - ntohl(sb->s_sequence); int dropped = info.end_transaction - ntohl(sb->s_sequence);
#endif #endif
jbd_debug(0, jbd_debug(0,
"JBD: ignoring %d transaction%s from the journal.\n", "JBD: ignoring %d transaction%s from the journal.\n",
dropped, (dropped == 1) ? "" : "s"); dropped, (dropped == 1) ? "" : "s");
...@@ -303,14 +301,12 @@ int journal_skip_recovery(journal_t *journal) ...@@ -303,14 +301,12 @@ int journal_skip_recovery(journal_t *journal)
} }
journal->j_tail = 0; journal->j_tail = 0;
return err; return err;
} }
static int do_one_pass(journal_t *journal, static int do_one_pass(journal_t *journal,
struct recovery_info *info, enum passtype pass) struct recovery_info *info, enum passtype pass)
{ {
unsigned int first_commit_ID, next_commit_ID; unsigned int first_commit_ID, next_commit_ID;
unsigned long next_log_block; unsigned long next_log_block;
int err, success = 0; int err, success = 0;
......
...@@ -466,7 +466,6 @@ int journal_cancel_revoke(handle_t *handle, struct journal_head *jh) ...@@ -466,7 +466,6 @@ int journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
__brelse(bh2); __brelse(bh2);
} }
} }
return did_revoke; return did_revoke;
} }
...@@ -701,4 +700,3 @@ void journal_clear_revoke(journal_t *journal) ...@@ -701,4 +700,3 @@ void journal_clear_revoke(journal_t *journal)
} }
} }
} }
...@@ -1272,7 +1272,6 @@ void journal_forget(handle_t *handle, struct buffer_head *bh) ...@@ -1272,7 +1272,6 @@ void journal_forget(handle_t *handle, struct buffer_head *bh)
return; return;
} }
} }
} else if (jh->b_transaction) { } else if (jh->b_transaction) {
J_ASSERT_JH(jh, (jh->b_transaction == J_ASSERT_JH(jh, (jh->b_transaction ==
journal->j_committing_transaction)); journal->j_committing_transaction));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment