[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>

diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 0d21d558b87a19d2105d32ff8df19698ffe439a5..92bf78221429365bce894157170f57b1636e996e 100644 (file)
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -258,7 +258,7 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
                default:
                        return -EINVAL;
        }
-       if (acl) {
+       if (acl) {
                value = ext3_acl_to_disk(acl, &size);
                if (IS_ERR(value))
                        return (int)PTR_ERR(value);

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index f1897feb18f4a415aa406984a4303ce8d230fa73..c19be8fc3e51b565728d8a177f46e573b0e5f13c 100644 (file)
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -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 @@ void ext3_init_block_alloc_info(struct inode *inode)
                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 @@ bitmap_search_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh,
                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 @@ claim_block(spinlock_t *lock, ext3_grpblk_t block, struct buffer_head *bh)
  * 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 @@ fail_access:
 }
 
 /**
- *     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 @@ fail_access:
  *             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 @@ fail_access:
  *             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 @@ static int find_next_reservable_window(
                        /*
                         * Found a reserveable space big enough.  We could
                         * have a reservation across the group boundary here
-                        */
+                        */
                        break;
                }
        }
@@ -998,7 +998,7 @@ static int find_next_reservable_window(
 }
 
 /**
- *     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

diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 6f9e5a523c877a1cd99f5c76b8782bce7dc33212..4d97f437cd480ebe0eca72b153fbcac27c8b303c 100644 (file)
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -67,7 +67,7 @@ int ext3_check_dir_entry (const char * function, struct inode * dir,
                          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";

diff --git a/fs/ext3/hash.c b/fs/ext3/hash.c
index 7fa637cd322adef605dea92336f07159f660bdd9..deeb27b5ba833d25009c33c3c31752fec8d79dd3 100644 (file)
--- a/fs/ext3/hash.c
+++ b/fs/ext3/hash.c
@@ -95,7 +95,7 @@ int ext3fs_dirhash(const char *name, int len, struct dx_hash_info *hinfo)
        __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;

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 56665fab027d78a0f880658efa9fd780f050388e..c9fc15f8b609923232e7b1c4c2fc906ec66967fa 100644 (file)
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -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 @@ static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block,
  *     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 @@ static int walk_page_buffers(     handle_t *handle,
 
        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;

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 70dc5206ebfa30e5cff54fe86dc48046707b9c29..85d132c37ee0f1a8a8c840432d7839f4d9b97af6 100644 (file)
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -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 @@ static struct stats dx_show_leaf(struct dx_hash_info *hinfo, struct ext3_dir_ent
                                       ((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 @@ static int ext3_mknod (struct inode * dir, struct dentry *dentry,
 
 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 @@ static int empty_dir (struct inode * inode)
                        !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 @@ static int ext3_symlink (struct inode * dir,
 
 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 @@ static int ext3_rename (struct inode * old_dir, struct dentry *old_dentry,
                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);
 

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 4b526b49610281664c98c300be7fe61e4bcaacb9..0544325d9d7e1b1e8ccc0ca5dc30b31f2a3d69fe 100644 (file)
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -734,8 +734,8 @@ static match_table_t tokens = {
 
 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 @@ static int __init init_ext3_fs(void)
 out:
        destroy_inodecache();
 out1:
-       exit_ext3_xattr();
+       exit_ext3_xattr();
        return err;
 }
 

diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 961ada28db5e4a37bd6b38dcd20141f3b6dba24d..0208cc7ac5d0f0835ed0bceb206cce2baef5fae5 100644 (file)
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -480,7 +480,7 @@ static int journal_clean_one_cp_list(struct journal_head *jh, int *released)
        if (!jh)
                return 0;
 
-       last_jh = jh->b_cpprev;
+       last_jh = jh->b_cpprev;
        do {
                jh = next_jh;
                next_jh = jh->b_cpnext;

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 88d970e09ce64bd815b4f01076fc6cb2f828cd2d..b571209d6a1eb463e51a33fbb8badf92233239dc 100644 (file)
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -181,7 +181,7 @@ loop:
                                                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();

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index 73bb64806ed3bd9546c9859e683d3f2ce7a7fea6..445eed6ce5dc6d0c9196aab99b68d0e53cad1a67 100644 (file)
--- a/fs/jbd/recovery.c
+++ b/fs/jbd/recovery.c
@@ -314,7 +314,7 @@ static int do_one_pass(journal_t *journal,
        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;

diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index bf7fd71178175f37aa361712feb26dc05439313c..e1b3c8af4d1767cd8b530e90cb482655f891fa6f 100644 (file)
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -580,7 +580,7 @@ repeat:
                 */
                JBUFFER_TRACE(jh, "Unexpected dirty buffer");
                jbd_unexpected_dirty_buffer(jh);
-       }
+       }
 
        unlock_buffer(bh);
 
@@ -1373,7 +1373,7 @@ int journal_stop(handle_t *handle)
        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 @@ void journal_invalidatepage(journal_t *journal,
                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);

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 0eed918b38168a05a3847a641243a3622862aa10..369c675023460f97668b59c40de9e93ddabe278d 100644 (file)
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -473,7 +473,7 @@ struct ext3_super_block {
        __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 */
 };
 

diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index 2f18b9511f211f728bf1e631a554b53d1dd124ee..4395e5206746b33be79bd57bef264da8a74bcd0a 100644 (file)
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -35,7 +35,7 @@ struct ext3_reserve_window {
 };
 
 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;

diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index dc262624efa55e1aa650e11e4a0ec9086d2c4eb4..a6d9daa38c6d4da99fa6f6bffe9b99a5c6c79ae0 100644 (file)
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -64,7 +64,7 @@ extern int journal_enable_debug;
                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 @@ typedef struct journal_superblock_s
 
 /* 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 @@ struct journal_s
        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.