Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63f57933 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] ext4 whitespace cleanups 



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

Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ceea16bf

fs/ext4/dir.c

+4 −3
Original line number Diff line number Diff line
@@ -188,8 +188,9 @@ static int ext4_readdir(struct file * filp, 
			de = (struct ext4_dir_entry_2 *) (bh->b_data + offset);

			if (!ext4_check_dir_entry ("ext4_readdir", inode, de,

						   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 |

						(sb->s_blocksize - 1)) + 1;

				brelse (bh);

fs/ext4/extents.c

+7 −7
Original line number Diff line number Diff line
@@ -1097,8 +1097,8 @@ static int inline 
ext4_can_extents_be_merged(struct inode *inode, struct ext4_extent *ex1,

				struct ext4_extent *ex2)

{

        if (le32_to_cpu(ex1->ee_block) + le16_to_cpu(ex1->ee_len)

	    != le32_to_cpu(ex2->ee_block))

	if (le32_to_cpu(ex1->ee_block) + le16_to_cpu(ex1->ee_len) !=

			le32_to_cpu(ex2->ee_block))

		return 0;



	/*

fs/ext4/namei.c

+25 −27
Original line number Diff line number Diff line
@@ -243,9 +243,9 @@ static void dx_show_index (char * label, struct dx_entry *entries) 
{

	int i, n = dx_get_count (entries);

        printk("%s index ", label);

        for (i = 0; i < n; i++)

        {

                printk("%x->%u ", i? dx_get_hash(entries + i): 0, dx_get_block(entries + i));

	for (i = 0; i < n; i++) {

		printk("%x->%u ", i? dx_get_hash(entries + i) :

				0, dx_get_block(entries + i));

	}

	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;

	int more;

	/* Combsort until bubble sort doesn't suck */

        while (count > 2)

	{

	while (count > 2) {

		count = count*10/13;

		if (count - 9 < 2) /* 9, 10 -> 11 */

			count = 11;
@@ -704,8 +703,7 @@ static void dx_sort_map (struct dx_map_entry *map, unsigned count) 
	do {

		more = 0;

		q = top;

                while (q-- > map)

		{

		while (q-- > map) {

			if (q[1].hash >= q[0].hash)

				continue;

			swap(*(q+1), *q);

fs/ext4/super.c

+8 −6
Original line number Diff line number Diff line
@@ -1191,9 +1191,10 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es, 
			"running e2fsck is recommended\n");

#if 0

		/* @@@ We _will_ want to clear the valid bit if we find

                   inconsistencies, to force a fsck at reboot.  But for

                   a plain journaled filesystem we can keep it set as

                   valid forever! :) */

		 * inconsistencies, to force a fsck at reboot.  But for

		 * a plain journaled filesystem we can keep it set as

		 * valid forever! :)

		 */

	es->s_state = cpu_to_le16(le16_to_cpu(es->s_state) & ~EXT4_VALID_FS);

#endif

	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)) {

	case 0:

		/* No mode set, assume a default based on the journal

                   capabilities: ORDERED_DATA if the journal can

                   cope, else JOURNAL_DATA */

		 * capabilities: ORDERED_DATA if the journal can

		 * cope, else JOURNAL_DATA

		 */

		if (jbd2_journal_check_available_features

		    (sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE))

			set_opt(sbi->s_mount_opt, ORDERED_DATA);

fs/ext4/acl.c

+2 −2

File changed.

Contains only whitespace changes.