diff options
author | Theodore Ts'o <tytso@mit.edu> | 2010-05-17 07:00:00 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-05-17 07:00:00 -0400 |
commit | 60e6679e28518ccd67169c4a539d8cc7490eb8a6 (patch) | |
tree | 65f39d1e9da3006df5bc5532d0c8a7ec365599f0 /fs/ext4 | |
parent | 4d92dc0f00a775dc2e1267b0e00befb783902fe7 (diff) |
ext4: Drop whitespace at end of lines
This patch was generated using:
#!/usr/bin/perl -i
while (<>) {
s/[ ]+$//;
print;
}
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/block_validity.c | 4 | ||||
-rw-r--r-- | fs/ext4/ext4.h | 4 | ||||
-rw-r--r-- | fs/ext4/extents.c | 8 | ||||
-rw-r--r-- | fs/ext4/fsync.c | 2 | ||||
-rw-r--r-- | fs/ext4/inode.c | 4 | ||||
-rw-r--r-- | fs/ext4/ioctl.c | 2 | ||||
-rw-r--r-- | fs/ext4/mballoc.c | 8 | ||||
-rw-r--r-- | fs/ext4/namei.c | 10 | ||||
-rw-r--r-- | fs/ext4/super.c | 4 |
9 files changed, 23 insertions, 23 deletions
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 538c48655084..5b6973fbf1bd 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c | |||
@@ -72,9 +72,9 @@ static int add_system_zone(struct ext4_sb_info *sbi, | |||
72 | else if (start_blk >= (entry->start_blk + entry->count)) | 72 | else if (start_blk >= (entry->start_blk + entry->count)) |
73 | n = &(*n)->rb_right; | 73 | n = &(*n)->rb_right; |
74 | else { | 74 | else { |
75 | if (start_blk + count > (entry->start_blk + | 75 | if (start_blk + count > (entry->start_blk + |
76 | entry->count)) | 76 | entry->count)) |
77 | entry->count = (start_blk + count - | 77 | entry->count = (start_blk + count - |
78 | entry->start_blk); | 78 | entry->start_blk); |
79 | new_node = *n; | 79 | new_node = *n; |
80 | new_entry = rb_entry(new_node, struct ext4_system_zone, | 80 | new_entry = rb_entry(new_node, struct ext4_system_zone, |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 2c1165f731ac..124ef771a618 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -75,7 +75,7 @@ typedef __u32 ext4_lblk_t; | |||
75 | typedef unsigned int ext4_group_t; | 75 | typedef unsigned int ext4_group_t; |
76 | 76 | ||
77 | /* | 77 | /* |
78 | * Flags used in mballoc's allocation_context flags field. | 78 | * Flags used in mballoc's allocation_context flags field. |
79 | * | 79 | * |
80 | * Also used to show what's going on for debugging purposes when the | 80 | * Also used to show what's going on for debugging purposes when the |
81 | * flag field is exported via the traceport interface | 81 | * flag field is exported via the traceport interface |
@@ -470,7 +470,7 @@ struct ext4_new_group_data { | |||
470 | #define EXT4_GET_BLOCKS_CREATE_UNINIT_EXT (EXT4_GET_BLOCKS_UNINIT_EXT|\ | 470 | #define EXT4_GET_BLOCKS_CREATE_UNINIT_EXT (EXT4_GET_BLOCKS_UNINIT_EXT|\ |
471 | EXT4_GET_BLOCKS_CREATE) | 471 | EXT4_GET_BLOCKS_CREATE) |
472 | /* Caller is from the delayed allocation writeout path, | 472 | /* Caller is from the delayed allocation writeout path, |
473 | so set the magic i_delalloc_reserve_flag after taking the | 473 | so set the magic i_delalloc_reserve_flag after taking the |
474 | inode allocation semaphore for */ | 474 | inode allocation semaphore for */ |
475 | #define EXT4_GET_BLOCKS_DELALLOC_RESERVE 0x0004 | 475 | #define EXT4_GET_BLOCKS_DELALLOC_RESERVE 0x0004 |
476 | /* caller is from the direct IO path, request to creation of an | 476 | /* caller is from the direct IO path, request to creation of an |
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 0a47becf668a..377309c1af65 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -182,10 +182,10 @@ static ext4_fsblk_t ext4_ext_find_goal(struct inode *inode, | |||
182 | if (flex_size >= EXT4_FLEX_SIZE_DIR_ALLOC_SCHEME) { | 182 | if (flex_size >= EXT4_FLEX_SIZE_DIR_ALLOC_SCHEME) { |
183 | /* | 183 | /* |
184 | * If there are at least EXT4_FLEX_SIZE_DIR_ALLOC_SCHEME | 184 | * If there are at least EXT4_FLEX_SIZE_DIR_ALLOC_SCHEME |
185 | * block groups per flexgroup, reserve the first block | 185 | * block groups per flexgroup, reserve the first block |
186 | * group for directories and special files. Regular | 186 | * group for directories and special files. Regular |
187 | * files will start at the second block group. This | 187 | * files will start at the second block group. This |
188 | * tends to speed up directory access and improves | 188 | * tends to speed up directory access and improves |
189 | * fsck times. | 189 | * fsck times. |
190 | */ | 190 | */ |
191 | block_group &= ~(flex_size-1); | 191 | block_group &= ~(flex_size-1); |
@@ -2034,7 +2034,7 @@ ext4_ext_in_cache(struct inode *inode, ext4_lblk_t block, | |||
2034 | struct ext4_ext_cache *cex; | 2034 | struct ext4_ext_cache *cex; |
2035 | int ret = EXT4_EXT_CACHE_NO; | 2035 | int ret = EXT4_EXT_CACHE_NO; |
2036 | 2036 | ||
2037 | /* | 2037 | /* |
2038 | * We borrow i_block_reservation_lock to protect i_cached_extent | 2038 | * We borrow i_block_reservation_lock to protect i_cached_extent |
2039 | */ | 2039 | */ |
2040 | spin_lock(&EXT4_I(inode)->i_block_reservation_lock); | 2040 | spin_lock(&EXT4_I(inode)->i_block_reservation_lock); |
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 42bd94a942c9..6ca7b6e59d83 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c | |||
@@ -66,7 +66,7 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync) | |||
66 | ret = flush_completed_IO(inode); | 66 | ret = flush_completed_IO(inode); |
67 | if (ret < 0) | 67 | if (ret < 0) |
68 | return ret; | 68 | return ret; |
69 | 69 | ||
70 | if (!journal) | 70 | if (!journal) |
71 | return simple_fsync(file, dentry, datasync); | 71 | return simple_fsync(file, dentry, datasync); |
72 | 72 | ||
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 8e45331b6560..502b07dc70d0 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -784,7 +784,7 @@ failed: | |||
784 | /* Allocation failed, free what we already allocated */ | 784 | /* Allocation failed, free what we already allocated */ |
785 | ext4_free_blocks(handle, inode, 0, new_blocks[0], 1, 0); | 785 | ext4_free_blocks(handle, inode, 0, new_blocks[0], 1, 0); |
786 | for (i = 1; i <= n ; i++) { | 786 | for (i = 1; i <= n ; i++) { |
787 | /* | 787 | /* |
788 | * branch[i].bh is newly allocated, so there is no | 788 | * branch[i].bh is newly allocated, so there is no |
789 | * need to revoke the block, which is why we don't | 789 | * need to revoke the block, which is why we don't |
790 | * need to set EXT4_FREE_BLOCKS_METADATA. | 790 | * need to set EXT4_FREE_BLOCKS_METADATA. |
@@ -874,7 +874,7 @@ static int ext4_splice_branch(handle_t *handle, struct inode *inode, | |||
874 | 874 | ||
875 | err_out: | 875 | err_out: |
876 | for (i = 1; i <= num; i++) { | 876 | for (i = 1; i <= num; i++) { |
877 | /* | 877 | /* |
878 | * branch[i].bh is newly allocated, so there is no | 878 | * branch[i].bh is newly allocated, so there is no |
879 | * need to revoke the block, which is why we don't | 879 | * need to revoke the block, which is why we don't |
880 | * need to set EXT4_FREE_BLOCKS_METADATA. | 880 | * need to set EXT4_FREE_BLOCKS_METADATA. |
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 6ddec84846cd..bf5ae883b1bd 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c | |||
@@ -258,7 +258,7 @@ setversion_out: | |||
258 | if (me.moved_len > 0) | 258 | if (me.moved_len > 0) |
259 | file_remove_suid(donor_filp); | 259 | file_remove_suid(donor_filp); |
260 | 260 | ||
261 | if (copy_to_user((struct move_extent __user *)arg, | 261 | if (copy_to_user((struct move_extent __user *)arg, |
262 | &me, sizeof(me))) | 262 | &me, sizeof(me))) |
263 | err = -EFAULT; | 263 | err = -EFAULT; |
264 | mext_out: | 264 | mext_out: |
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index a93f554b6803..12b3bc026a68 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -2691,7 +2691,7 @@ int __init init_ext4_mballoc(void) | |||
2691 | 2691 | ||
2692 | void exit_ext4_mballoc(void) | 2692 | void exit_ext4_mballoc(void) |
2693 | { | 2693 | { |
2694 | /* | 2694 | /* |
2695 | * Wait for completion of call_rcu()'s on ext4_pspace_cachep | 2695 | * Wait for completion of call_rcu()'s on ext4_pspace_cachep |
2696 | * before destroying the slab cache. | 2696 | * before destroying the slab cache. |
2697 | */ | 2697 | */ |
@@ -3330,7 +3330,7 @@ static void ext4_mb_put_pa(struct ext4_allocation_context *ac, | |||
3330 | spin_unlock(&pa->pa_lock); | 3330 | spin_unlock(&pa->pa_lock); |
3331 | 3331 | ||
3332 | grp_blk = pa->pa_pstart; | 3332 | grp_blk = pa->pa_pstart; |
3333 | /* | 3333 | /* |
3334 | * If doing group-based preallocation, pa_pstart may be in the | 3334 | * If doing group-based preallocation, pa_pstart may be in the |
3335 | * next group when pa is used up | 3335 | * next group when pa is used up |
3336 | */ | 3336 | */ |
@@ -4534,12 +4534,12 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, | |||
4534 | if (!bh) | 4534 | if (!bh) |
4535 | tbh = sb_find_get_block(inode->i_sb, | 4535 | tbh = sb_find_get_block(inode->i_sb, |
4536 | block + i); | 4536 | block + i); |
4537 | ext4_forget(handle, flags & EXT4_FREE_BLOCKS_METADATA, | 4537 | ext4_forget(handle, flags & EXT4_FREE_BLOCKS_METADATA, |
4538 | inode, tbh, block + i); | 4538 | inode, tbh, block + i); |
4539 | } | 4539 | } |
4540 | } | 4540 | } |
4541 | 4541 | ||
4542 | /* | 4542 | /* |
4543 | * We need to make sure we don't reuse the freed block until | 4543 | * We need to make sure we don't reuse the freed block until |
4544 | * after the transaction is committed, which we can do by | 4544 | * after the transaction is committed, which we can do by |
4545 | * treating the block as metadata, below. We make an | 4545 | * treating the block as metadata, below. We make an |
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 7b4bf8feae4e..83be743c8d1f 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -187,7 +187,7 @@ unsigned int ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize) | |||
187 | return blocksize; | 187 | return blocksize; |
188 | return (len & 65532) | ((len & 3) << 16); | 188 | return (len & 65532) | ((len & 3) << 16); |
189 | } | 189 | } |
190 | 190 | ||
191 | __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) | 191 | __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) |
192 | { | 192 | { |
193 | if ((len > blocksize) || (blocksize > (1 << 18)) || (len & 3)) | 193 | if ((len > blocksize) || (blocksize > (1 << 18)) || (len & 3)) |
@@ -197,7 +197,7 @@ __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) | |||
197 | if (len == blocksize) { | 197 | if (len == blocksize) { |
198 | if (blocksize == 65536) | 198 | if (blocksize == 65536) |
199 | return cpu_to_le16(EXT4_MAX_REC_LEN); | 199 | return cpu_to_le16(EXT4_MAX_REC_LEN); |
200 | else | 200 | else |
201 | return cpu_to_le16(0); | 201 | return cpu_to_le16(0); |
202 | } | 202 | } |
203 | return cpu_to_le16((len & 65532) | ((len >> 16) & 3)); | 203 | return cpu_to_le16((len & 65532) | ((len >> 16) & 3)); |
@@ -349,7 +349,7 @@ struct stats dx_show_entries(struct dx_hash_info *hinfo, struct inode *dir, | |||
349 | brelse(bh); | 349 | brelse(bh); |
350 | } | 350 | } |
351 | if (bcount) | 351 | if (bcount) |
352 | printk(KERN_DEBUG "%snames %u, fullness %u (%u%%)\n", | 352 | printk(KERN_DEBUG "%snames %u, fullness %u (%u%%)\n", |
353 | levels ? "" : " ", names, space/bcount, | 353 | levels ? "" : " ", names, space/bcount, |
354 | (space/bcount)*100/blocksize); | 354 | (space/bcount)*100/blocksize); |
355 | return (struct stats) { names, space, bcount}; | 355 | return (struct stats) { names, space, bcount}; |
@@ -653,7 +653,7 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, | |||
653 | int ret, err; | 653 | int ret, err; |
654 | __u32 hashval; | 654 | __u32 hashval; |
655 | 655 | ||
656 | dxtrace(printk(KERN_DEBUG "In htree_fill_tree, start hash: %x:%x\n", | 656 | dxtrace(printk(KERN_DEBUG "In htree_fill_tree, start hash: %x:%x\n", |
657 | start_hash, start_minor_hash)); | 657 | start_hash, start_minor_hash)); |
658 | dir = dir_file->f_path.dentry->d_inode; | 658 | dir = dir_file->f_path.dentry->d_inode; |
659 | if (!(ext4_test_inode_flag(dir, EXT4_INODE_INDEX))) { | 659 | if (!(ext4_test_inode_flag(dir, EXT4_INODE_INDEX))) { |
@@ -1141,7 +1141,7 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count, | |||
1141 | unsigned rec_len = 0; | 1141 | unsigned rec_len = 0; |
1142 | 1142 | ||
1143 | while (count--) { | 1143 | while (count--) { |
1144 | struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) | 1144 | struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) |
1145 | (from + (map->offs<<2)); | 1145 | (from + (map->offs<<2)); |
1146 | rec_len = EXT4_DIR_REC_LEN(de->name_len); | 1146 | rec_len = EXT4_DIR_REC_LEN(de->name_len); |
1147 | memcpy (to, de, rec_len); | 1147 | memcpy (to, de, rec_len); |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 9766b2ae6cdc..49d88c0597c4 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -2216,7 +2216,7 @@ static unsigned long ext4_get_stripe_size(struct ext4_sb_info *sbi) | |||
2216 | struct ext4_attr { | 2216 | struct ext4_attr { |
2217 | struct attribute attr; | 2217 | struct attribute attr; |
2218 | ssize_t (*show)(struct ext4_attr *, struct ext4_sb_info *, char *); | 2218 | ssize_t (*show)(struct ext4_attr *, struct ext4_sb_info *, char *); |
2219 | ssize_t (*store)(struct ext4_attr *, struct ext4_sb_info *, | 2219 | ssize_t (*store)(struct ext4_attr *, struct ext4_sb_info *, |
2220 | const char *, size_t); | 2220 | const char *, size_t); |
2221 | int offset; | 2221 | int offset; |
2222 | }; | 2222 | }; |
@@ -3383,7 +3383,7 @@ static int ext4_commit_super(struct super_block *sb, int sync) | |||
3383 | if (!(sb->s_flags & MS_RDONLY)) | 3383 | if (!(sb->s_flags & MS_RDONLY)) |
3384 | es->s_wtime = cpu_to_le32(get_seconds()); | 3384 | es->s_wtime = cpu_to_le32(get_seconds()); |
3385 | es->s_kbytes_written = | 3385 | es->s_kbytes_written = |
3386 | cpu_to_le64(EXT4_SB(sb)->s_kbytes_written + | 3386 | cpu_to_le64(EXT4_SB(sb)->s_kbytes_written + |
3387 | ((part_stat_read(sb->s_bdev->bd_part, sectors[1]) - | 3387 | ((part_stat_read(sb->s_bdev->bd_part, sectors[1]) - |
3388 | EXT4_SB(sb)->s_sectors_written_start) >> 1)); | 3388 | EXT4_SB(sb)->s_sectors_written_start) >> 1)); |
3389 | ext4_free_blocks_count_set(es, percpu_counter_sum_positive( | 3389 | ext4_free_blocks_count_set(es, percpu_counter_sum_positive( |