diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-09-27 04:49:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:10 -0400 |
commit | e9ad5620bfb901df8a7a2603c88689ededeecaf1 (patch) | |
tree | 82a2b22e1b7401b98fc2f201b8df2db05764332a | |
parent | 7543fc7b3abfee8c6cd6349ebd5e5fde02fac984 (diff) |
[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>
-rw-r--r-- | fs/ext3/acl.c | 2 | ||||
-rw-r--r-- | fs/ext3/balloc.c | 32 | ||||
-rw-r--r-- | fs/ext3/dir.c | 2 | ||||
-rw-r--r-- | fs/ext3/hash.c | 2 | ||||
-rw-r--r-- | fs/ext3/inode.c | 8 | ||||
-rw-r--r-- | fs/ext3/namei.c | 18 | ||||
-rw-r--r-- | fs/ext3/super.c | 6 | ||||
-rw-r--r-- | fs/jbd/checkpoint.c | 2 | ||||
-rw-r--r-- | fs/jbd/journal.c | 2 | ||||
-rw-r--r-- | fs/jbd/recovery.c | 2 | ||||
-rw-r--r-- | fs/jbd/transaction.c | 6 | ||||
-rw-r--r-- | include/linux/ext3_fs.h | 2 | ||||
-rw-r--r-- | include/linux/ext3_fs_i.h | 2 | ||||
-rw-r--r-- | include/linux/jbd.h | 10 |
14 files changed, 48 insertions, 48 deletions
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index 0d21d558b87a..92bf78221429 100644 --- 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, | |||
258 | default: | 258 | default: |
259 | return -EINVAL; | 259 | return -EINVAL; |
260 | } | 260 | } |
261 | if (acl) { | 261 | if (acl) { |
262 | value = ext3_acl_to_disk(acl, &size); | 262 | value = ext3_acl_to_disk(acl, &size); |
263 | if (IS_ERR(value)) | 263 | if (IS_ERR(value)) |
264 | return (int)PTR_ERR(value); | 264 | return (int)PTR_ERR(value); |
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index f1897feb18f4..c19be8fc3e51 100644 --- a/fs/ext3/balloc.c +++ b/fs/ext3/balloc.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | /** | 41 | /** |
42 | * ext3_get_group_desc() -- load group descriptor from disk | 42 | * ext3_get_group_desc() -- load group descriptor from disk |
43 | * @sb: super block | 43 | * @sb: super block |
44 | * @block_group: given block group | 44 | * @block_group: given block group |
45 | * @bh: pointer to the buffer head to store the block | 45 | * @bh: pointer to the buffer head to store the block |
46 | * group descriptor | 46 | * group descriptor |
@@ -355,7 +355,7 @@ void ext3_init_block_alloc_info(struct inode *inode) | |||
355 | rsv->rsv_start = EXT3_RESERVE_WINDOW_NOT_ALLOCATED; | 355 | rsv->rsv_start = EXT3_RESERVE_WINDOW_NOT_ALLOCATED; |
356 | rsv->rsv_end = EXT3_RESERVE_WINDOW_NOT_ALLOCATED; | 356 | rsv->rsv_end = EXT3_RESERVE_WINDOW_NOT_ALLOCATED; |
357 | 357 | ||
358 | /* | 358 | /* |
359 | * if filesystem is mounted with NORESERVATION, the goal | 359 | * if filesystem is mounted with NORESERVATION, the goal |
360 | * reservation window size is set to zero to indicate | 360 | * reservation window size is set to zero to indicate |
361 | * block reservation is off | 361 | * block reservation is off |
@@ -681,7 +681,7 @@ bitmap_search_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh, | |||
681 | jbd_lock_bh_state(bh); | 681 | jbd_lock_bh_state(bh); |
682 | if (jh->b_committed_data) | 682 | if (jh->b_committed_data) |
683 | start = ext3_find_next_zero_bit(jh->b_committed_data, | 683 | start = ext3_find_next_zero_bit(jh->b_committed_data, |
684 | maxblocks, next); | 684 | maxblocks, next); |
685 | jbd_unlock_bh_state(bh); | 685 | jbd_unlock_bh_state(bh); |
686 | } | 686 | } |
687 | return -1; | 687 | return -1; |
@@ -790,10 +790,10 @@ claim_block(spinlock_t *lock, ext3_grpblk_t block, struct buffer_head *bh) | |||
790 | * and at last, allocate the blocks by claiming the found free bit as allocated. | 790 | * and at last, allocate the blocks by claiming the found free bit as allocated. |
791 | * | 791 | * |
792 | * To set the range of this allocation: | 792 | * To set the range of this allocation: |
793 | * if there is a reservation window, only try to allocate block(s) from the | 793 | * if there is a reservation window, only try to allocate block(s) from the |
794 | * file's own reservation window; | 794 | * file's own reservation window; |
795 | * Otherwise, the allocation range starts from the give goal block, ends at | 795 | * Otherwise, the allocation range starts from the give goal block, ends at |
796 | * the block group's last block. | 796 | * the block group's last block. |
797 | * | 797 | * |
798 | * If we failed to allocate the desired block then we may end up crossing to a | 798 | * If we failed to allocate the desired block then we may end up crossing to a |
799 | * new bitmap. In that case we must release write access to the old one via | 799 | * new bitmap. In that case we must release write access to the old one via |
@@ -880,12 +880,12 @@ fail_access: | |||
880 | } | 880 | } |
881 | 881 | ||
882 | /** | 882 | /** |
883 | * find_next_reservable_window(): | 883 | * find_next_reservable_window(): |
884 | * find a reservable space within the given range. | 884 | * find a reservable space within the given range. |
885 | * It does not allocate the reservation window for now: | 885 | * It does not allocate the reservation window for now: |
886 | * alloc_new_reservation() will do the work later. | 886 | * alloc_new_reservation() will do the work later. |
887 | * | 887 | * |
888 | * @search_head: the head of the searching list; | 888 | * @search_head: the head of the searching list; |
889 | * This is not necessarily the list head of the whole filesystem | 889 | * This is not necessarily the list head of the whole filesystem |
890 | * | 890 | * |
891 | * We have both head and start_block to assist the search | 891 | * We have both head and start_block to assist the search |
@@ -893,12 +893,12 @@ fail_access: | |||
893 | * but we will shift to the place where start_block is, | 893 | * but we will shift to the place where start_block is, |
894 | * then start from there, when looking for a reservable space. | 894 | * then start from there, when looking for a reservable space. |
895 | * | 895 | * |
896 | * @size: the target new reservation window size | 896 | * @size: the target new reservation window size |
897 | * | 897 | * |
898 | * @group_first_block: the first block we consider to start | 898 | * @group_first_block: the first block we consider to start |
899 | * the real search from | 899 | * the real search from |
900 | * | 900 | * |
901 | * @last_block: | 901 | * @last_block: |
902 | * the maximum block number that our goal reservable space | 902 | * the maximum block number that our goal reservable space |
903 | * could start from. This is normally the last block in this | 903 | * could start from. This is normally the last block in this |
904 | * group. The search will end when we found the start of next | 904 | * group. The search will end when we found the start of next |
@@ -906,10 +906,10 @@ fail_access: | |||
906 | * This could handle the cross boundary reservation window | 906 | * This could handle the cross boundary reservation window |
907 | * request. | 907 | * request. |
908 | * | 908 | * |
909 | * basically we search from the given range, rather than the whole | 909 | * basically we search from the given range, rather than the whole |
910 | * reservation double linked list, (start_block, last_block) | 910 | * reservation double linked list, (start_block, last_block) |
911 | * to find a free region that is of my size and has not | 911 | * to find a free region that is of my size and has not |
912 | * been reserved. | 912 | * been reserved. |
913 | * | 913 | * |
914 | */ | 914 | */ |
915 | static int find_next_reservable_window( | 915 | static int find_next_reservable_window( |
@@ -962,7 +962,7 @@ static int find_next_reservable_window( | |||
962 | /* | 962 | /* |
963 | * Found a reserveable space big enough. We could | 963 | * Found a reserveable space big enough. We could |
964 | * have a reservation across the group boundary here | 964 | * have a reservation across the group boundary here |
965 | */ | 965 | */ |
966 | break; | 966 | break; |
967 | } | 967 | } |
968 | } | 968 | } |
@@ -998,7 +998,7 @@ static int find_next_reservable_window( | |||
998 | } | 998 | } |
999 | 999 | ||
1000 | /** | 1000 | /** |
1001 | * alloc_new_reservation()--allocate a new reservation window | 1001 | * alloc_new_reservation()--allocate a new reservation window |
1002 | * | 1002 | * |
1003 | * To make a new reservation, we search part of the filesystem | 1003 | * To make a new reservation, we search part of the filesystem |
1004 | * reservation list (the list that inside the group). We try to | 1004 | * reservation list (the list that inside the group). We try to |
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index 6f9e5a523c87..4d97f437cd48 100644 --- 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, | |||
67 | unsigned long offset) | 67 | unsigned long offset) |
68 | { | 68 | { |
69 | const char * error_msg = NULL; | 69 | const char * error_msg = NULL; |
70 | const int rlen = le16_to_cpu(de->rec_len); | 70 | const int rlen = le16_to_cpu(de->rec_len); |
71 | 71 | ||
72 | if (rlen < EXT3_DIR_REC_LEN(1)) | 72 | if (rlen < EXT3_DIR_REC_LEN(1)) |
73 | error_msg = "rec_len is smaller than minimal"; | 73 | error_msg = "rec_len is smaller than minimal"; |
diff --git a/fs/ext3/hash.c b/fs/ext3/hash.c index 7fa637cd322a..deeb27b5ba83 100644 --- 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) | |||
95 | __u32 minor_hash = 0; | 95 | __u32 minor_hash = 0; |
96 | const char *p; | 96 | const char *p; |
97 | int i; | 97 | int i; |
98 | __u32 in[8], buf[4]; | 98 | __u32 in[8], buf[4]; |
99 | 99 | ||
100 | /* Initialize the default seed for the hash checksum functions */ | 100 | /* Initialize the default seed for the hash checksum functions */ |
101 | buf[0] = 0x67452301; | 101 | buf[0] = 0x67452301; |
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 56665fab027d..c9fc15f8b609 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
@@ -13,11 +13,11 @@ | |||
13 | * Copyright (C) 1991, 1992 Linus Torvalds | 13 | * Copyright (C) 1991, 1992 Linus Torvalds |
14 | * | 14 | * |
15 | * Goal-directed block allocation by Stephen Tweedie | 15 | * Goal-directed block allocation by Stephen Tweedie |
16 | * (sct@redhat.com), 1993, 1998 | 16 | * (sct@redhat.com), 1993, 1998 |
17 | * Big-endian to little-endian byte-swapping/bitmaps by | 17 | * Big-endian to little-endian byte-swapping/bitmaps by |
18 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 18 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
19 | * 64-bit file support on 64-bit platforms by Jakub Jelinek | 19 | * 64-bit file support on 64-bit platforms by Jakub Jelinek |
20 | * (jj@sunsite.ms.mff.cuni.cz) | 20 | * (jj@sunsite.ms.mff.cuni.cz) |
21 | * | 21 | * |
22 | * Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000 | 22 | * Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000 |
23 | */ | 23 | */ |
@@ -470,7 +470,7 @@ static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block, | |||
470 | * ext3_blks_to_allocate: Look up the block map and count the number | 470 | * ext3_blks_to_allocate: Look up the block map and count the number |
471 | * of direct blocks need to be allocated for the given branch. | 471 | * of direct blocks need to be allocated for the given branch. |
472 | * | 472 | * |
473 | * @branch: chain of indirect blocks | 473 | * @branch: chain of indirect blocks |
474 | * @k: number of blocks need for indirect blocks | 474 | * @k: number of blocks need for indirect blocks |
475 | * @blks: number of data blocks to be mapped. | 475 | * @blks: number of data blocks to be mapped. |
476 | * @blocks_to_boundary: the offset in the indirect block | 476 | * @blocks_to_boundary: the offset in the indirect block |
@@ -1098,7 +1098,7 @@ static int walk_page_buffers( handle_t *handle, | |||
1098 | 1098 | ||
1099 | for ( bh = head, block_start = 0; | 1099 | for ( bh = head, block_start = 0; |
1100 | ret == 0 && (bh != head || !block_start); | 1100 | ret == 0 && (bh != head || !block_start); |
1101 | block_start = block_end, bh = next) | 1101 | block_start = block_end, bh = next) |
1102 | { | 1102 | { |
1103 | next = bh->b_this_page; | 1103 | next = bh->b_this_page; |
1104 | block_end = block_start + blocksize; | 1104 | block_end = block_start + blocksize; |
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 70dc5206ebfa..85d132c37ee0 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -15,13 +15,13 @@ | |||
15 | * Big-endian to little-endian byte-swapping/bitmaps by | 15 | * Big-endian to little-endian byte-swapping/bitmaps by |
16 | * David S. Miller (davem@caip.rutgers.edu), 1995 | 16 | * David S. Miller (davem@caip.rutgers.edu), 1995 |
17 | * Directory entry file type support and forward compatibility hooks | 17 | * Directory entry file type support and forward compatibility hooks |
18 | * for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998 | 18 | * for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998 |
19 | * Hash Tree Directory indexing (c) | 19 | * Hash Tree Directory indexing (c) |
20 | * Daniel Phillips, 2001 | 20 | * Daniel Phillips, 2001 |
21 | * Hash Tree Directory indexing porting | 21 | * Hash Tree Directory indexing porting |
22 | * Christopher Li, 2002 | 22 | * Christopher Li, 2002 |
23 | * Hash Tree Directory indexing cleanup | 23 | * Hash Tree Directory indexing cleanup |
24 | * Theodore Ts'o, 2002 | 24 | * Theodore Ts'o, 2002 |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
@@ -278,7 +278,7 @@ static struct stats dx_show_leaf(struct dx_hash_info *hinfo, struct ext3_dir_ent | |||
278 | ((char *) de - base)); | 278 | ((char *) de - base)); |
279 | } | 279 | } |
280 | space += EXT3_DIR_REC_LEN(de->name_len); | 280 | space += EXT3_DIR_REC_LEN(de->name_len); |
281 | names++; | 281 | names++; |
282 | } | 282 | } |
283 | de = (struct ext3_dir_entry_2 *) ((char *) de + le16_to_cpu(de->rec_len)); | 283 | de = (struct ext3_dir_entry_2 *) ((char *) de + le16_to_cpu(de->rec_len)); |
284 | } | 284 | } |
@@ -1688,7 +1688,7 @@ static int ext3_mknod (struct inode * dir, struct dentry *dentry, | |||
1688 | 1688 | ||
1689 | retry: | 1689 | retry: |
1690 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + | 1690 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + |
1691 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + | 1691 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + |
1692 | 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); | 1692 | 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); |
1693 | if (IS_ERR(handle)) | 1693 | if (IS_ERR(handle)) |
1694 | return PTR_ERR(handle); | 1694 | return PTR_ERR(handle); |
@@ -1816,7 +1816,7 @@ static int empty_dir (struct inode * inode) | |||
1816 | !le32_to_cpu(de1->inode) || | 1816 | !le32_to_cpu(de1->inode) || |
1817 | strcmp (".", de->name) || | 1817 | strcmp (".", de->name) || |
1818 | strcmp ("..", de1->name)) { | 1818 | strcmp ("..", de1->name)) { |
1819 | ext3_warning (inode->i_sb, "empty_dir", | 1819 | ext3_warning (inode->i_sb, "empty_dir", |
1820 | "bad directory (dir #%lu) - no `.' or `..'", | 1820 | "bad directory (dir #%lu) - no `.' or `..'", |
1821 | inode->i_ino); | 1821 | inode->i_ino); |
1822 | brelse (bh); | 1822 | brelse (bh); |
@@ -2129,7 +2129,7 @@ static int ext3_symlink (struct inode * dir, | |||
2129 | 2129 | ||
2130 | retry: | 2130 | retry: |
2131 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + | 2131 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + |
2132 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 + | 2132 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 + |
2133 | 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); | 2133 | 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); |
2134 | if (IS_ERR(handle)) | 2134 | if (IS_ERR(handle)) |
2135 | return PTR_ERR(handle); | 2135 | return PTR_ERR(handle); |
@@ -2227,7 +2227,7 @@ static int ext3_rename (struct inode * old_dir, struct dentry *old_dentry, | |||
2227 | DQUOT_INIT(new_dentry->d_inode); | 2227 | DQUOT_INIT(new_dentry->d_inode); |
2228 | handle = ext3_journal_start(old_dir, 2 * | 2228 | handle = ext3_journal_start(old_dir, 2 * |
2229 | EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) + | 2229 | EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) + |
2230 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2); | 2230 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2); |
2231 | if (IS_ERR(handle)) | 2231 | if (IS_ERR(handle)) |
2232 | return PTR_ERR(handle); | 2232 | return PTR_ERR(handle); |
2233 | 2233 | ||
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 4b526b496102..0544325d9d7e 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -734,8 +734,8 @@ static match_table_t tokens = { | |||
734 | 734 | ||
735 | static ext3_fsblk_t get_sb_block(void **data) | 735 | static ext3_fsblk_t get_sb_block(void **data) |
736 | { | 736 | { |
737 | ext3_fsblk_t sb_block; | 737 | ext3_fsblk_t sb_block; |
738 | char *options = (char *) *data; | 738 | char *options = (char *) *data; |
739 | 739 | ||
740 | if (!options || strncmp(options, "sb=", 3) != 0) | 740 | if (!options || strncmp(options, "sb=", 3) != 0) |
741 | return 1; /* Default location */ | 741 | return 1; /* Default location */ |
@@ -2740,7 +2740,7 @@ static int __init init_ext3_fs(void) | |||
2740 | out: | 2740 | out: |
2741 | destroy_inodecache(); | 2741 | destroy_inodecache(); |
2742 | out1: | 2742 | out1: |
2743 | exit_ext3_xattr(); | 2743 | exit_ext3_xattr(); |
2744 | return err; | 2744 | return err; |
2745 | } | 2745 | } |
2746 | 2746 | ||
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index 961ada28db5e..0208cc7ac5d0 100644 --- 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) | |||
480 | if (!jh) | 480 | if (!jh) |
481 | return 0; | 481 | return 0; |
482 | 482 | ||
483 | last_jh = jh->b_cpprev; | 483 | last_jh = jh->b_cpprev; |
484 | do { | 484 | do { |
485 | jh = next_jh; | 485 | jh = next_jh; |
486 | next_jh = jh->b_cpnext; | 486 | next_jh = jh->b_cpnext; |
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 88d970e09ce6..b571209d6a1e 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -181,7 +181,7 @@ loop: | |||
181 | transaction->t_expires)) | 181 | transaction->t_expires)) |
182 | should_sleep = 0; | 182 | should_sleep = 0; |
183 | if (journal->j_flags & JFS_UNMOUNT) | 183 | if (journal->j_flags & JFS_UNMOUNT) |
184 | should_sleep = 0; | 184 | should_sleep = 0; |
185 | if (should_sleep) { | 185 | if (should_sleep) { |
186 | spin_unlock(&journal->j_state_lock); | 186 | spin_unlock(&journal->j_state_lock); |
187 | schedule(); | 187 | schedule(); |
diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c index 73bb64806ed3..445eed6ce5dc 100644 --- a/fs/jbd/recovery.c +++ b/fs/jbd/recovery.c | |||
@@ -314,7 +314,7 @@ static int do_one_pass(journal_t *journal, | |||
314 | unsigned long next_log_block; | 314 | unsigned long next_log_block; |
315 | int err, success = 0; | 315 | int err, success = 0; |
316 | journal_superblock_t * sb; | 316 | journal_superblock_t * sb; |
317 | journal_header_t * tmp; | 317 | journal_header_t * tmp; |
318 | struct buffer_head * bh; | 318 | struct buffer_head * bh; |
319 | unsigned int sequence; | 319 | unsigned int sequence; |
320 | int blocktype; | 320 | int blocktype; |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index bf7fd7117817..e1b3c8af4d17 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -580,7 +580,7 @@ repeat: | |||
580 | */ | 580 | */ |
581 | JBUFFER_TRACE(jh, "Unexpected dirty buffer"); | 581 | JBUFFER_TRACE(jh, "Unexpected dirty buffer"); |
582 | jbd_unexpected_dirty_buffer(jh); | 582 | jbd_unexpected_dirty_buffer(jh); |
583 | } | 583 | } |
584 | 584 | ||
585 | unlock_buffer(bh); | 585 | unlock_buffer(bh); |
586 | 586 | ||
@@ -1373,7 +1373,7 @@ int journal_stop(handle_t *handle) | |||
1373 | if (handle->h_sync || | 1373 | if (handle->h_sync || |
1374 | transaction->t_outstanding_credits > | 1374 | transaction->t_outstanding_credits > |
1375 | journal->j_max_transaction_buffers || | 1375 | journal->j_max_transaction_buffers || |
1376 | time_after_eq(jiffies, transaction->t_expires)) { | 1376 | time_after_eq(jiffies, transaction->t_expires)) { |
1377 | /* Do this even for aborted journals: an abort still | 1377 | /* Do this even for aborted journals: an abort still |
1378 | * completes the commit thread, it just doesn't write | 1378 | * completes the commit thread, it just doesn't write |
1379 | * anything to disk. */ | 1379 | * anything to disk. */ |
@@ -1908,7 +1908,7 @@ void journal_invalidatepage(journal_t *journal, | |||
1908 | next = bh->b_this_page; | 1908 | next = bh->b_this_page; |
1909 | 1909 | ||
1910 | if (offset <= curr_off) { | 1910 | if (offset <= curr_off) { |
1911 | /* This block is wholly outside the truncation point */ | 1911 | /* This block is wholly outside the truncation point */ |
1912 | lock_buffer(bh); | 1912 | lock_buffer(bh); |
1913 | may_free &= journal_unmap_buffer(journal, bh); | 1913 | may_free &= journal_unmap_buffer(journal, bh); |
1914 | unlock_buffer(bh); | 1914 | unlock_buffer(bh); |
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index 0eed918b3816..369c67502346 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h | |||
@@ -473,7 +473,7 @@ struct ext3_super_block { | |||
473 | __u8 s_reserved_char_pad; | 473 | __u8 s_reserved_char_pad; |
474 | __u16 s_reserved_word_pad; | 474 | __u16 s_reserved_word_pad; |
475 | __le32 s_default_mount_opts; | 475 | __le32 s_default_mount_opts; |
476 | __le32 s_first_meta_bg; /* First metablock block group */ | 476 | __le32 s_first_meta_bg; /* First metablock block group */ |
477 | __u32 s_reserved[190]; /* Padding to the end of the block */ | 477 | __u32 s_reserved[190]; /* Padding to the end of the block */ |
478 | }; | 478 | }; |
479 | 479 | ||
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h index 2f18b9511f21..4395e5206746 100644 --- a/include/linux/ext3_fs_i.h +++ b/include/linux/ext3_fs_i.h | |||
@@ -35,7 +35,7 @@ struct ext3_reserve_window { | |||
35 | }; | 35 | }; |
36 | 36 | ||
37 | struct ext3_reserve_window_node { | 37 | struct ext3_reserve_window_node { |
38 | struct rb_node rsv_node; | 38 | struct rb_node rsv_node; |
39 | __u32 rsv_goal_size; | 39 | __u32 rsv_goal_size; |
40 | __u32 rsv_alloc_hit; | 40 | __u32 rsv_alloc_hit; |
41 | struct ext3_reserve_window rsv_window; | 41 | struct ext3_reserve_window rsv_window; |
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index dc262624efa5..a6d9daa38c6d 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -64,7 +64,7 @@ extern int journal_enable_debug; | |||
64 | if ((n) <= journal_enable_debug) { \ | 64 | if ((n) <= journal_enable_debug) { \ |
65 | printk (KERN_DEBUG "(%s, %d): %s: ", \ | 65 | printk (KERN_DEBUG "(%s, %d): %s: ", \ |
66 | __FILE__, __LINE__, __FUNCTION__); \ | 66 | __FILE__, __LINE__, __FUNCTION__); \ |
67 | printk (f, ## a); \ | 67 | printk (f, ## a); \ |
68 | } \ | 68 | } \ |
69 | } while (0) | 69 | } while (0) |
70 | #else | 70 | #else |
@@ -201,9 +201,9 @@ typedef struct journal_superblock_s | |||
201 | 201 | ||
202 | /* 0x0024 */ | 202 | /* 0x0024 */ |
203 | /* Remaining fields are only valid in a version-2 superblock */ | 203 | /* Remaining fields are only valid in a version-2 superblock */ |
204 | __be32 s_feature_compat; /* compatible feature set */ | 204 | __be32 s_feature_compat; /* compatible feature set */ |
205 | __be32 s_feature_incompat; /* incompatible feature set */ | 205 | __be32 s_feature_incompat; /* incompatible feature set */ |
206 | __be32 s_feature_ro_compat; /* readonly-compatible feature set */ | 206 | __be32 s_feature_ro_compat; /* readonly-compatible feature set */ |
207 | /* 0x0030 */ | 207 | /* 0x0030 */ |
208 | __u8 s_uuid[16]; /* 128-bit uuid for journal */ | 208 | __u8 s_uuid[16]; /* 128-bit uuid for journal */ |
209 | 209 | ||
@@ -699,7 +699,7 @@ struct journal_s | |||
699 | wait_queue_head_t j_wait_updates; | 699 | wait_queue_head_t j_wait_updates; |
700 | 700 | ||
701 | /* Semaphore for locking against concurrent checkpoints */ | 701 | /* Semaphore for locking against concurrent checkpoints */ |
702 | struct mutex j_checkpoint_mutex; | 702 | struct mutex j_checkpoint_mutex; |
703 | 703 | ||
704 | /* | 704 | /* |
705 | * Journal head: identifies the first unused block in the journal. | 705 | * Journal head: identifies the first unused block in the journal. |