diff options
author | Glauber de Oliveira Costa <glommer@br.ibm.com> | 2006-01-08 04:03:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:56 -0500 |
commit | 29ba17231222c42ca3df5424f43949e2a6fddec2 (patch) | |
tree | 8081c7ffd66a42bc82b685350bcc46e38c94ff4f | |
parent | 9f40668d7d14d4d16cedc2104bfb63a43584dacf (diff) |
[PATCH] ext3: use sbi instead of EXT3_SB() in resize code.
There are places in the resize code in which EXT3_SB() macro is used after
an statement like sbi = EXT3_SB(sb) is done. Inside the same function,
both sbi and EXT3_SB() are used to reference the super block Altough it is
not wrong, keeping it coherent increases legibility, IMHO.
Signed-off-by: Glauber de Oliveira Costa <glommer@br.ibm.com>
Cc: "Stephen C. Tweedie" <sct@redhat.com>
Cc: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/ext3/resize.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c index 675aa24b0059..1041dab6de2f 100644 --- a/fs/ext3/resize.c +++ b/fs/ext3/resize.c | |||
@@ -31,7 +31,7 @@ static int verify_group_input(struct super_block *sb, | |||
31 | unsigned start = le32_to_cpu(es->s_blocks_count); | 31 | unsigned start = le32_to_cpu(es->s_blocks_count); |
32 | unsigned end = start + input->blocks_count; | 32 | unsigned end = start + input->blocks_count; |
33 | unsigned group = input->group; | 33 | unsigned group = input->group; |
34 | unsigned itend = input->inode_table + EXT3_SB(sb)->s_itb_per_group; | 34 | unsigned itend = input->inode_table + sbi->s_itb_per_group; |
35 | unsigned overhead = ext3_bg_has_super(sb, group) ? | 35 | unsigned overhead = ext3_bg_has_super(sb, group) ? |
36 | (1 + ext3_bg_num_gdb(sb, group) + | 36 | (1 + ext3_bg_num_gdb(sb, group) + |
37 | le16_to_cpu(es->s_reserved_gdt_blocks)) : 0; | 37 | le16_to_cpu(es->s_reserved_gdt_blocks)) : 0; |
@@ -764,7 +764,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) | |||
764 | } | 764 | } |
765 | 765 | ||
766 | lock_super(sb); | 766 | lock_super(sb); |
767 | if (input->group != EXT3_SB(sb)->s_groups_count) { | 767 | if (input->group != sbi->s_groups_count) { |
768 | ext3_warning(sb, __FUNCTION__, | 768 | ext3_warning(sb, __FUNCTION__, |
769 | "multiple resizers run on filesystem!"); | 769 | "multiple resizers run on filesystem!"); |
770 | err = -EBUSY; | 770 | err = -EBUSY; |
@@ -799,7 +799,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) | |||
799 | * data. So we need to be careful to set all of the relevant | 799 | * data. So we need to be careful to set all of the relevant |
800 | * group descriptor data etc. *before* we enable the group. | 800 | * group descriptor data etc. *before* we enable the group. |
801 | * | 801 | * |
802 | * The key field here is EXT3_SB(sb)->s_groups_count: as long as | 802 | * The key field here is sbi->s_groups_count: as long as |
803 | * that retains its old value, nobody is going to access the new | 803 | * that retains its old value, nobody is going to access the new |
804 | * group. | 804 | * group. |
805 | * | 805 | * |
@@ -859,7 +859,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) | |||
859 | smp_wmb(); | 859 | smp_wmb(); |
860 | 860 | ||
861 | /* Update the global fs size fields */ | 861 | /* Update the global fs size fields */ |
862 | EXT3_SB(sb)->s_groups_count++; | 862 | sbi->s_groups_count++; |
863 | 863 | ||
864 | ext3_journal_dirty_metadata(handle, primary); | 864 | ext3_journal_dirty_metadata(handle, primary); |
865 | 865 | ||
@@ -874,7 +874,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) | |||
874 | percpu_counter_mod(&sbi->s_freeinodes_counter, | 874 | percpu_counter_mod(&sbi->s_freeinodes_counter, |
875 | EXT3_INODES_PER_GROUP(sb)); | 875 | EXT3_INODES_PER_GROUP(sb)); |
876 | 876 | ||
877 | ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); | 877 | ext3_journal_dirty_metadata(handle, sbi->s_sbh); |
878 | sb->s_dirt = 1; | 878 | sb->s_dirt = 1; |
879 | 879 | ||
880 | exit_journal: | 880 | exit_journal: |