lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ext4 whitespace cleanups

Browse Source 
Someone's tab key is emitting spaces.  Attempt to repair some of the damage.

Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-10-11 01:21:24 -07:00
committed by Linus Torvalds
parent ceea16bf85
commit 63f5793351
5 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ext4/dir.c
View File

@@ -188,8 +188,9 @@ revalidate:
de = (struct ext4_dir_entry_2 *) (bh->b_data + offset); de = (struct ext4_dir_entry_2 *) (bh->b_data + offset);
if (!ext4_check_dir_entry ("ext4_readdir", inode, de, if (!ext4_check_dir_entry ("ext4_readdir", inode, de,
bh, offset)) { bh, offset)) {
/* On error, skip the f_pos to the /*
next block. */ * On error, skip the f_pos to the next block
*/
filp->f_pos = (filp->f_pos | filp->f_pos = (filp->f_pos |
(sb->s_blocksize - 1)) + 1; (sb->s_blocksize - 1)) + 1;
brelse (bh); brelse (bh);

4
fs/ext4/extents.c
View File

@@ -1097,8 +1097,8 @@ static int inline
ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1, ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1,
struct ext4_extent *ex2) struct ext4_extent *ex2)
{ {
if (le32_to_cpu(ex1->ee_block) + le16_to_cpu(ex1->ee_len) if (le32_to_cpu(ex1->ee_block) + le16_to_cpu(ex1->ee_len) !=
!= le32_to_cpu(ex2->ee_block)) le32_to_cpu(ex2->ee_block))
return 0; return 0;
/* /*

12
fs/ext4/namei.c
View File

@@ -243,9 +243,9 @@ static void dx_show_index (char * label, struct dx_entry *entries)
{ {
int i, n = dx_get_count (entries); int i, n = dx_get_count (entries);
printk("%s index ", label); printk("%s index ", label);
for (i = 0; i < n; i++) for (i = 0; i < n; i++) {
{ printk("%x->%u ", i? dx_get_hash(entries + i) :
printk("%x->%u ", i? dx_get_hash(entries + i): 0, dx_get_block(entries + i)); 0, dx_get_block(entries + i));
} }
printk("\n"); printk("\n");
} }
@@ -691,8 +691,7 @@ static void dx_sort_map (struct dx_map_entry *map, unsigned count)
struct dx_map_entry *p, *q, *top = map + count - 1; struct dx_map_entry *p, *q, *top = map + count - 1;
int more; int more;
/* Combsort until bubble sort doesn't suck */ /* Combsort until bubble sort doesn't suck */
while (count > 2) while (count > 2) {
{
count = count*10/13; count = count*10/13;
if (count - 9 < 2) /* 9, 10 -> 11 */ if (count - 9 < 2) /* 9, 10 -> 11 */
count = 11; count = 11;
@@ -704,8 +703,7 @@ static void dx_sort_map (struct dx_map_entry *map, unsigned count)
do { do {
more = 0; more = 0;
q = top; q = top;
while (q-- > map) while (q-- > map) {
{
if (q[1].hash >= q[0].hash) if (q[1].hash >= q[0].hash)
continue; continue;
swap(*(q+1), *q); swap(*(q+1), *q);

12
fs/ext4/super.c
View File

@@ -1191,9 +1191,10 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
"running e2fsck is recommended\n"); "running e2fsck is recommended\n");
#if 0 #if 0
/* @@@ We _will_ want to clear the valid bit if we find /* @@@ We _will_ want to clear the valid bit if we find
inconsistencies, to force a fsck at reboot. But for * inconsistencies, to force a fsck at reboot. But for
a plain journaled filesystem we can keep it set as * a plain journaled filesystem we can keep it set as
valid forever! :) */ * valid forever! :)
*/
es->s_state = cpu_to_le16(le16_to_cpu(es->s_state) & ~EXT4_VALID_FS); es->s_state = cpu_to_le16(le16_to_cpu(es->s_state) & ~EXT4_VALID_FS);
#endif #endif
if (!(__s16) le16_to_cpu(es->s_max_mnt_count)) if (!(__s16) le16_to_cpu(es->s_max_mnt_count))
@@ -1791,8 +1792,9 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
switch (test_opt(sb, DATA_FLAGS)) { switch (test_opt(sb, DATA_FLAGS)) {
case 0: case 0:
/* No mode set, assume a default based on the journal /* No mode set, assume a default based on the journal
capabilities: ORDERED_DATA if the journal can * capabilities: ORDERED_DATA if the journal can
cope, else JOURNAL_DATA */ * cope, else JOURNAL_DATA
*/
if (jbd2_journal_check_available_features if (jbd2_journal_check_available_features
(sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE)) (sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE))
set_opt(sbi->s_mount_opt, ORDERED_DATA); set_opt(sbi->s_mount_opt, ORDERED_DATA);