]>
Commit | Line | Data |
---|---|---|
7d777456 GKH |
1 | From 5fc0d2b4f06dfd2a941e23171a5a4a155383c47a Mon Sep 17 00:00:00 2001 |
2 | From: Jing Zhang <zj.barak@gmail.com> | |
3 | Date: Sun, 30 May 2010 22:49:46 -0400 | |
4 | Subject: ext4: rename ext4_mb_release_desc() to ext4_mb_unload_buddy() | |
5 | ||
6 | commit e39e07fdfd98be8650385f12a7b81d6adc547510 upstream (as of v2.6.34-git13) | |
7 | ||
8 | This function cleans up after ext4_mb_load_buddy(), so the renaming | |
9 | makes the code clearer. | |
10 | ||
11 | Signed-off-by: Jing Zhang <zj.barak@gmail.com> | |
12 | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> | |
13 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
14 | --- | |
15 | fs/ext4/mballoc.c | 24 ++++++++++++------------ | |
16 | 1 file changed, 12 insertions(+), 12 deletions(-) | |
17 | ||
18 | --- a/fs/ext4/mballoc.c | |
19 | +++ b/fs/ext4/mballoc.c | |
20 | @@ -1150,7 +1150,7 @@ err: | |
21 | return ret; | |
22 | } | |
23 | ||
24 | -static void ext4_mb_release_desc(struct ext4_buddy *e4b) | |
25 | +static void ext4_mb_unload_buddy(struct ext4_buddy *e4b) | |
26 | { | |
27 | if (e4b->bd_bitmap_page) | |
28 | page_cache_release(e4b->bd_bitmap_page); | |
29 | @@ -1618,7 +1618,7 @@ int ext4_mb_try_best_found(struct ext4_a | |
30 | } | |
31 | ||
32 | ext4_unlock_group(ac->ac_sb, group); | |
33 | - ext4_mb_release_desc(e4b); | |
34 | + ext4_mb_unload_buddy(e4b); | |
35 | ||
36 | return 0; | |
37 | } | |
38 | @@ -1674,7 +1674,7 @@ int ext4_mb_find_by_goal(struct ext4_all | |
39 | ext4_mb_use_best_found(ac, e4b); | |
40 | } | |
41 | ext4_unlock_group(ac->ac_sb, group); | |
42 | - ext4_mb_release_desc(e4b); | |
43 | + ext4_mb_unload_buddy(e4b); | |
44 | ||
45 | return 0; | |
46 | } | |
47 | @@ -2044,7 +2044,7 @@ repeat: | |
48 | if (!ext4_mb_good_group(ac, group, cr)) { | |
49 | /* someone did allocation from this group */ | |
50 | ext4_unlock_group(sb, group); | |
51 | - ext4_mb_release_desc(&e4b); | |
52 | + ext4_mb_unload_buddy(&e4b); | |
53 | continue; | |
54 | } | |
55 | ||
56 | @@ -2058,7 +2058,7 @@ repeat: | |
57 | ext4_mb_complex_scan_group(ac, &e4b); | |
58 | ||
59 | ext4_unlock_group(sb, group); | |
60 | - ext4_mb_release_desc(&e4b); | |
61 | + ext4_mb_unload_buddy(&e4b); | |
62 | ||
63 | if (ac->ac_status != AC_STATUS_CONTINUE) | |
64 | break; | |
65 | @@ -2148,7 +2148,7 @@ static int ext4_mb_seq_groups_show(struc | |
66 | ext4_lock_group(sb, group); | |
67 | memcpy(&sg, ext4_get_group_info(sb, group), i); | |
68 | ext4_unlock_group(sb, group); | |
69 | - ext4_mb_release_desc(&e4b); | |
70 | + ext4_mb_unload_buddy(&e4b); | |
71 | ||
72 | seq_printf(seq, "#%-5u: %-5u %-5u %-5u [", group, sg.info.bb_free, | |
73 | sg.info.bb_fragments, sg.info.bb_first_free); | |
74 | @@ -2568,7 +2568,7 @@ static void release_blocks_on_commit(jou | |
75 | } | |
76 | ext4_unlock_group(sb, entry->group); | |
77 | kmem_cache_free(ext4_free_ext_cachep, entry); | |
78 | - ext4_mb_release_desc(&e4b); | |
79 | + ext4_mb_unload_buddy(&e4b); | |
80 | } | |
81 | ||
82 | mb_debug(1, "freed %u blocks in %u structures\n", count, count2); | |
83 | @@ -3705,7 +3705,7 @@ out: | |
84 | ext4_unlock_group(sb, group); | |
85 | if (ac) | |
86 | kmem_cache_free(ext4_ac_cachep, ac); | |
87 | - ext4_mb_release_desc(&e4b); | |
88 | + ext4_mb_unload_buddy(&e4b); | |
89 | put_bh(bitmap_bh); | |
90 | return free; | |
91 | } | |
92 | @@ -3809,7 +3809,7 @@ repeat: | |
93 | if (bitmap_bh == NULL) { | |
94 | ext4_error(sb, __func__, "Error in reading block " | |
95 | "bitmap for %u", group); | |
96 | - ext4_mb_release_desc(&e4b); | |
97 | + ext4_mb_unload_buddy(&e4b); | |
98 | continue; | |
99 | } | |
100 | ||
101 | @@ -3818,7 +3818,7 @@ repeat: | |
102 | ext4_mb_release_inode_pa(&e4b, bitmap_bh, pa, ac); | |
103 | ext4_unlock_group(sb, group); | |
104 | ||
105 | - ext4_mb_release_desc(&e4b); | |
106 | + ext4_mb_unload_buddy(&e4b); | |
107 | put_bh(bitmap_bh); | |
108 | ||
109 | list_del(&pa->u.pa_tmp_list); | |
110 | @@ -4082,7 +4082,7 @@ ext4_mb_discard_lg_preallocations(struct | |
111 | ext4_mb_release_group_pa(&e4b, pa, ac); | |
112 | ext4_unlock_group(sb, group); | |
113 | ||
114 | - ext4_mb_release_desc(&e4b); | |
115 | + ext4_mb_unload_buddy(&e4b); | |
116 | list_del(&pa->u.pa_tmp_list); | |
117 | call_rcu(&(pa)->u.pa_rcu, ext4_mb_pa_callback); | |
118 | } | |
119 | @@ -4584,7 +4584,7 @@ do_more: | |
120 | atomic_add(count, &sbi->s_flex_groups[flex_group].free_blocks); | |
121 | } | |
122 | ||
123 | - ext4_mb_release_desc(&e4b); | |
124 | + ext4_mb_unload_buddy(&e4b); | |
125 | ||
126 | *freed += count; | |
127 |