diff options
author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2007-06-06 16:28:35 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2007-06-06 16:28:35 -0400 |
commit | f720e3ba558680cc7dd3995d005bdc8ee2ef46af (patch) | |
tree | 7217f0618795aa1c0a097adf73442842e6fd668c /fs/jfs/resize.c | |
parent | 5ecd3100e695228ac5e0ce0e325e252c0f11806f (diff) |
JFS: Whitespace cleanup and remove some dead code
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Diffstat (limited to 'fs/jfs/resize.c')
-rw-r--r-- | fs/jfs/resize.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c index 79d625f3f733..71984ee95346 100644 --- a/fs/jfs/resize.c +++ b/fs/jfs/resize.c | |||
@@ -29,17 +29,17 @@ | |||
29 | #include "jfs_txnmgr.h" | 29 | #include "jfs_txnmgr.h" |
30 | #include "jfs_debug.h" | 30 | #include "jfs_debug.h" |
31 | 31 | ||
32 | #define BITSPERPAGE (PSIZE << 3) | 32 | #define BITSPERPAGE (PSIZE << 3) |
33 | #define L2MEGABYTE 20 | 33 | #define L2MEGABYTE 20 |
34 | #define MEGABYTE (1 << L2MEGABYTE) | 34 | #define MEGABYTE (1 << L2MEGABYTE) |
35 | #define MEGABYTE32 (MEGABYTE << 5) | 35 | #define MEGABYTE32 (MEGABYTE << 5) |
36 | 36 | ||
37 | /* convert block number to bmap file page number */ | 37 | /* convert block number to bmap file page number */ |
38 | #define BLKTODMAPN(b)\ | 38 | #define BLKTODMAPN(b)\ |
39 | (((b) >> 13) + ((b) >> 23) + ((b) >> 33) + 3 + 1) | 39 | (((b) >> 13) + ((b) >> 23) + ((b) >> 33) + 3 + 1) |
40 | 40 | ||
41 | /* | 41 | /* |
42 | * jfs_extendfs() | 42 | * jfs_extendfs() |
43 | * | 43 | * |
44 | * function: extend file system; | 44 | * function: extend file system; |
45 | * | 45 | * |
@@ -48,9 +48,9 @@ | |||
48 | * workspace space | 48 | * workspace space |
49 | * | 49 | * |
50 | * input: | 50 | * input: |
51 | * new LVSize: in LV blocks (required) | 51 | * new LVSize: in LV blocks (required) |
52 | * new LogSize: in LV blocks (optional) | 52 | * new LogSize: in LV blocks (optional) |
53 | * new FSSize: in LV blocks (optional) | 53 | * new FSSize: in LV blocks (optional) |
54 | * | 54 | * |
55 | * new configuration: | 55 | * new configuration: |
56 | * 1. set new LogSize as specified or default from new LVSize; | 56 | * 1. set new LogSize as specified or default from new LVSize; |
@@ -125,8 +125,8 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
125 | } | 125 | } |
126 | 126 | ||
127 | /* | 127 | /* |
128 | * reconfigure LV spaces | 128 | * reconfigure LV spaces |
129 | * --------------------- | 129 | * --------------------- |
130 | * | 130 | * |
131 | * validate new size, or, if not specified, determine new size | 131 | * validate new size, or, if not specified, determine new size |
132 | */ | 132 | */ |
@@ -198,7 +198,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
198 | log_formatted = 1; | 198 | log_formatted = 1; |
199 | } | 199 | } |
200 | /* | 200 | /* |
201 | * quiesce file system | 201 | * quiesce file system |
202 | * | 202 | * |
203 | * (prepare to move the inline log and to prevent map update) | 203 | * (prepare to move the inline log and to prevent map update) |
204 | * | 204 | * |
@@ -270,8 +270,8 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
270 | } | 270 | } |
271 | 271 | ||
272 | /* | 272 | /* |
273 | * extend block allocation map | 273 | * extend block allocation map |
274 | * --------------------------- | 274 | * --------------------------- |
275 | * | 275 | * |
276 | * extendfs() for new extension, retry after crash recovery; | 276 | * extendfs() for new extension, retry after crash recovery; |
277 | * | 277 | * |
@@ -283,7 +283,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
283 | * s_size: aggregate size in physical blocks; | 283 | * s_size: aggregate size in physical blocks; |
284 | */ | 284 | */ |
285 | /* | 285 | /* |
286 | * compute the new block allocation map configuration | 286 | * compute the new block allocation map configuration |
287 | * | 287 | * |
288 | * map dinode: | 288 | * map dinode: |
289 | * di_size: map file size in byte; | 289 | * di_size: map file size in byte; |
@@ -301,7 +301,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
301 | newNpages = BLKTODMAPN(t64) + 1; | 301 | newNpages = BLKTODMAPN(t64) + 1; |
302 | 302 | ||
303 | /* | 303 | /* |
304 | * extend map from current map (WITHOUT growing mapfile) | 304 | * extend map from current map (WITHOUT growing mapfile) |
305 | * | 305 | * |
306 | * map new extension with unmapped part of the last partial | 306 | * map new extension with unmapped part of the last partial |
307 | * dmap page, if applicable, and extra page(s) allocated | 307 | * dmap page, if applicable, and extra page(s) allocated |
@@ -341,8 +341,8 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
341 | XSize -= nblocks; | 341 | XSize -= nblocks; |
342 | 342 | ||
343 | /* | 343 | /* |
344 | * grow map file to cover remaining extension | 344 | * grow map file to cover remaining extension |
345 | * and/or one extra dmap page for next extendfs(); | 345 | * and/or one extra dmap page for next extendfs(); |
346 | * | 346 | * |
347 | * allocate new map pages and its backing blocks, and | 347 | * allocate new map pages and its backing blocks, and |
348 | * update map file xtree | 348 | * update map file xtree |
@@ -422,8 +422,8 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
422 | dbFinalizeBmap(ipbmap); | 422 | dbFinalizeBmap(ipbmap); |
423 | 423 | ||
424 | /* | 424 | /* |
425 | * update inode allocation map | 425 | * update inode allocation map |
426 | * --------------------------- | 426 | * --------------------------- |
427 | * | 427 | * |
428 | * move iag lists from old to new iag; | 428 | * move iag lists from old to new iag; |
429 | * agstart field is not updated for logredo() to reconstruct | 429 | * agstart field is not updated for logredo() to reconstruct |
@@ -442,8 +442,8 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
442 | } | 442 | } |
443 | 443 | ||
444 | /* | 444 | /* |
445 | * finalize | 445 | * finalize |
446 | * -------- | 446 | * -------- |
447 | * | 447 | * |
448 | * extension is committed when on-disk super block is | 448 | * extension is committed when on-disk super block is |
449 | * updated with new descriptors: logredo will recover | 449 | * updated with new descriptors: logredo will recover |
@@ -480,7 +480,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
480 | diFreeSpecial(ipbmap2); | 480 | diFreeSpecial(ipbmap2); |
481 | 481 | ||
482 | /* | 482 | /* |
483 | * update superblock | 483 | * update superblock |
484 | */ | 484 | */ |
485 | if ((rc = readSuper(sb, &bh))) | 485 | if ((rc = readSuper(sb, &bh))) |
486 | goto error_out; | 486 | goto error_out; |
@@ -530,7 +530,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
530 | 530 | ||
531 | resume: | 531 | resume: |
532 | /* | 532 | /* |
533 | * resume file system transactions | 533 | * resume file system transactions |
534 | */ | 534 | */ |
535 | txResume(sb); | 535 | txResume(sb); |
536 | 536 | ||