diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2005-11-07 06:16:07 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-07 08:18:56 -0500 |
commit | 182ec4eee397543101a6db8906ed88727d3f7e53 (patch) | |
tree | 0f6dd2c52697123702bdf0c3a7143537f947b060 /fs/jffs2/build.c | |
parent | 97894cda5773e59bd13e87b72077751099419a9f (diff) |
[JFFS2] Clean up trailing white spaces
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/build.c')
-rw-r--r-- | fs/jffs2/build.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c index af6d2ec01366..fff108bb118b 100644 --- a/fs/jffs2/build.c +++ b/fs/jffs2/build.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: build.c,v 1.84 2005/09/27 13:40:49 dedekind Exp $ | 10 | * $Id: build.c,v 1.85 2005/11/07 11:14:38 gleixner Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -129,10 +129,10 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c) | |||
129 | for_each_inode(i, c, ic) { | 129 | for_each_inode(i, c, ic) { |
130 | if (ic->nlink) | 130 | if (ic->nlink) |
131 | continue; | 131 | continue; |
132 | 132 | ||
133 | jffs2_build_remove_unlinked_inode(c, ic, &dead_fds); | 133 | jffs2_build_remove_unlinked_inode(c, ic, &dead_fds); |
134 | cond_resched(); | 134 | cond_resched(); |
135 | } | 135 | } |
136 | 136 | ||
137 | dbg_fsbuild("pass 2a starting\n"); | 137 | dbg_fsbuild("pass 2a starting\n"); |
138 | 138 | ||
@@ -149,7 +149,7 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c) | |||
149 | 149 | ||
150 | dbg_fsbuild("pass 2a complete\n"); | 150 | dbg_fsbuild("pass 2a complete\n"); |
151 | dbg_fsbuild("freeing temporary data structures\n"); | 151 | dbg_fsbuild("freeing temporary data structures\n"); |
152 | 152 | ||
153 | /* Finally, we can scan again and free the dirent structs */ | 153 | /* Finally, we can scan again and free the dirent structs */ |
154 | for_each_inode(i, c, ic) { | 154 | for_each_inode(i, c, ic) { |
155 | while(ic->scan_dents) { | 155 | while(ic->scan_dents) { |
@@ -161,7 +161,7 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c) | |||
161 | cond_resched(); | 161 | cond_resched(); |
162 | } | 162 | } |
163 | c->flags &= ~JFFS2_SB_FLAG_BUILDING; | 163 | c->flags &= ~JFFS2_SB_FLAG_BUILDING; |
164 | 164 | ||
165 | dbg_fsbuild("FS build complete\n"); | 165 | dbg_fsbuild("FS build complete\n"); |
166 | 166 | ||
167 | /* Rotate the lists by some number to ensure wear levelling */ | 167 | /* Rotate the lists by some number to ensure wear levelling */ |
@@ -191,7 +191,7 @@ static void jffs2_build_remove_unlinked_inode(struct jffs2_sb_info *c, | |||
191 | struct jffs2_full_dirent *fd; | 191 | struct jffs2_full_dirent *fd; |
192 | 192 | ||
193 | dbg_fsbuild("removing ino #%u with nlink == zero.\n", ic->ino); | 193 | dbg_fsbuild("removing ino #%u with nlink == zero.\n", ic->ino); |
194 | 194 | ||
195 | raw = ic->nodes; | 195 | raw = ic->nodes; |
196 | while (raw != (void *)ic) { | 196 | while (raw != (void *)ic) { |
197 | struct jffs2_raw_node_ref *next = raw->next_in_ino; | 197 | struct jffs2_raw_node_ref *next = raw->next_in_ino; |
@@ -220,7 +220,7 @@ static void jffs2_build_remove_unlinked_inode(struct jffs2_sb_info *c, | |||
220 | whinged = 1; | 220 | whinged = 1; |
221 | 221 | ||
222 | dbg_fsbuild("removing child \"%s\", ino #%u\n", fd->name, fd->ino); | 222 | dbg_fsbuild("removing child \"%s\", ino #%u\n", fd->name, fd->ino); |
223 | 223 | ||
224 | child_ic = jffs2_get_ino_cache(c, fd->ino); | 224 | child_ic = jffs2_get_ino_cache(c, fd->ino); |
225 | if (!child_ic) { | 225 | if (!child_ic) { |
226 | dbg_fsbuild("cannot remove child \"%s\", ino #%u, because it doesn't exist\n", | 226 | dbg_fsbuild("cannot remove child \"%s\", ino #%u, because it doesn't exist\n", |
@@ -229,11 +229,11 @@ static void jffs2_build_remove_unlinked_inode(struct jffs2_sb_info *c, | |||
229 | continue; | 229 | continue; |
230 | } | 230 | } |
231 | 231 | ||
232 | /* Reduce nlink of the child. If it's now zero, stick it on the | 232 | /* Reduce nlink of the child. If it's now zero, stick it on the |
233 | dead_fds list to be cleaned up later. Else just free the fd */ | 233 | dead_fds list to be cleaned up later. Else just free the fd */ |
234 | 234 | ||
235 | child_ic->nlink--; | 235 | child_ic->nlink--; |
236 | 236 | ||
237 | if (!child_ic->nlink) { | 237 | if (!child_ic->nlink) { |
238 | dbg_fsbuild("inode #%u (\"%s\") has now got zero nlink, adding to dead_fds list.\n", | 238 | dbg_fsbuild("inode #%u (\"%s\") has now got zero nlink, adding to dead_fds list.\n", |
239 | fd->ino, fd->name); | 239 | fd->ino, fd->name); |
@@ -248,7 +248,7 @@ static void jffs2_build_remove_unlinked_inode(struct jffs2_sb_info *c, | |||
248 | } | 248 | } |
249 | 249 | ||
250 | /* | 250 | /* |
251 | We don't delete the inocache from the hash list and free it yet. | 251 | We don't delete the inocache from the hash list and free it yet. |
252 | The erase code will do that, when all the nodes are completely gone. | 252 | The erase code will do that, when all the nodes are completely gone. |
253 | */ | 253 | */ |
254 | } | 254 | } |
@@ -262,7 +262,7 @@ static void jffs2_calc_trigger_levels(struct jffs2_sb_info *c) | |||
262 | because there's not enough free space... */ | 262 | because there's not enough free space... */ |
263 | c->resv_blocks_deletion = 2; | 263 | c->resv_blocks_deletion = 2; |
264 | 264 | ||
265 | /* Be conservative about how much space we need before we allow writes. | 265 | /* Be conservative about how much space we need before we allow writes. |
266 | On top of that which is required for deletia, require an extra 2% | 266 | On top of that which is required for deletia, require an extra 2% |
267 | of the medium to be available, for overhead caused by nodes being | 267 | of the medium to be available, for overhead caused by nodes being |
268 | split across blocks, etc. */ | 268 | split across blocks, etc. */ |
@@ -277,7 +277,7 @@ static void jffs2_calc_trigger_levels(struct jffs2_sb_info *c) | |||
277 | 277 | ||
278 | c->resv_blocks_gctrigger = c->resv_blocks_write + 1; | 278 | c->resv_blocks_gctrigger = c->resv_blocks_write + 1; |
279 | 279 | ||
280 | /* When do we allow garbage collection to merge nodes to make | 280 | /* When do we allow garbage collection to merge nodes to make |
281 | long-term progress at the expense of short-term space exhaustion? */ | 281 | long-term progress at the expense of short-term space exhaustion? */ |
282 | c->resv_blocks_gcmerge = c->resv_blocks_deletion + 1; | 282 | c->resv_blocks_gcmerge = c->resv_blocks_deletion + 1; |
283 | 283 | ||
@@ -303,7 +303,7 @@ static void jffs2_calc_trigger_levels(struct jffs2_sb_info *c) | |||
303 | c->resv_blocks_gcbad, c->resv_blocks_gcbad*c->sector_size/1024); | 303 | c->resv_blocks_gcbad, c->resv_blocks_gcbad*c->sector_size/1024); |
304 | dbg_fsbuild("Amount of dirty space required to GC: %d bytes\n", | 304 | dbg_fsbuild("Amount of dirty space required to GC: %d bytes\n", |
305 | c->nospc_dirty_size); | 305 | c->nospc_dirty_size); |
306 | } | 306 | } |
307 | 307 | ||
308 | int jffs2_do_mount_fs(struct jffs2_sb_info *c) | 308 | int jffs2_do_mount_fs(struct jffs2_sb_info *c) |
309 | { | 309 | { |
@@ -355,7 +355,7 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c) | |||
355 | #ifndef __ECOS | 355 | #ifndef __ECOS |
356 | if (jffs2_blocks_use_vmalloc(c)) | 356 | if (jffs2_blocks_use_vmalloc(c)) |
357 | vfree(c->blocks); | 357 | vfree(c->blocks); |
358 | else | 358 | else |
359 | #endif | 359 | #endif |
360 | kfree(c->blocks); | 360 | kfree(c->blocks); |
361 | 361 | ||