diff options
Diffstat (limited to 'fs/jfs/jfs_mount.c')
-rw-r--r-- | fs/jfs/jfs_mount.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c index 032d111bc330..4dd479834897 100644 --- a/fs/jfs/jfs_mount.c +++ b/fs/jfs/jfs_mount.c | |||
@@ -3,16 +3,16 @@ | |||
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | * the Free Software Foundation; either version 2 of the License, or |
7 | * (at your option) any later version. | 7 | * (at your option) any later version. |
8 | * | 8 | * |
9 | * This program is distributed in the hope that it will be useful, | 9 | * This program is distributed in the hope that it will be useful, |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See |
12 | * the GNU General Public License for more details. | 12 | * the GNU General Public License for more details. |
13 | * | 13 | * |
14 | * You should have received a copy of the GNU General Public License | 14 | * You should have received a copy of the GNU General Public License |
15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | 18 | ||
@@ -21,18 +21,18 @@ | |||
21 | * | 21 | * |
22 | * note: file system in transition to aggregate/fileset: | 22 | * note: file system in transition to aggregate/fileset: |
23 | * | 23 | * |
24 | * file system mount is interpreted as the mount of aggregate, | 24 | * file system mount is interpreted as the mount of aggregate, |
25 | * if not already mounted, and mount of the single/only fileset in | 25 | * if not already mounted, and mount of the single/only fileset in |
26 | * the aggregate; | 26 | * the aggregate; |
27 | * | 27 | * |
28 | * a file system/aggregate is represented by an internal inode | 28 | * a file system/aggregate is represented by an internal inode |
29 | * (aka mount inode) initialized with aggregate superblock; | 29 | * (aka mount inode) initialized with aggregate superblock; |
30 | * each vfs represents a fileset, and points to its "fileset inode | 30 | * each vfs represents a fileset, and points to its "fileset inode |
31 | * allocation map inode" (aka fileset inode): | 31 | * allocation map inode" (aka fileset inode): |
32 | * (an aggregate itself is structured recursively as a filset: | 32 | * (an aggregate itself is structured recursively as a filset: |
33 | * an internal vfs is constructed and points to its "fileset inode | 33 | * an internal vfs is constructed and points to its "fileset inode |
34 | * allocation map inode" (aka aggregate inode) where each inode | 34 | * allocation map inode" (aka aggregate inode) where each inode |
35 | * represents a fileset inode) so that inode number is mapped to | 35 | * represents a fileset inode) so that inode number is mapped to |
36 | * on-disk inode in uniform way at both aggregate and fileset level; | 36 | * on-disk inode in uniform way at both aggregate and fileset level; |
37 | * | 37 | * |
38 | * each vnode/inode of a fileset is linked to its vfs (to facilitate | 38 | * each vnode/inode of a fileset is linked to its vfs (to facilitate |
@@ -41,7 +41,7 @@ | |||
41 | * per aggregate information, e.g., block size, etc.) as well as | 41 | * per aggregate information, e.g., block size, etc.) as well as |
42 | * its file set inode. | 42 | * its file set inode. |
43 | * | 43 | * |
44 | * aggregate | 44 | * aggregate |
45 | * ipmnt | 45 | * ipmnt |
46 | * mntvfs -> fileset ipimap+ -> aggregate ipbmap -> aggregate ipaimap; | 46 | * mntvfs -> fileset ipimap+ -> aggregate ipbmap -> aggregate ipaimap; |
47 | * fileset vfs -> vp(1) <-> ... <-> vp(n) <->vproot; | 47 | * fileset vfs -> vp(1) <-> ... <-> vp(n) <->vproot; |
@@ -88,7 +88,7 @@ int jfs_mount(struct super_block *sb) | |||
88 | struct inode *ipbmap = NULL; | 88 | struct inode *ipbmap = NULL; |
89 | 89 | ||
90 | /* | 90 | /* |
91 | * read/validate superblock | 91 | * read/validate superblock |
92 | * (initialize mount inode from the superblock) | 92 | * (initialize mount inode from the superblock) |
93 | */ | 93 | */ |
94 | if ((rc = chkSuper(sb))) { | 94 | if ((rc = chkSuper(sb))) { |
@@ -238,7 +238,7 @@ int jfs_mount(struct super_block *sb) | |||
238 | */ | 238 | */ |
239 | int jfs_mount_rw(struct super_block *sb, int remount) | 239 | int jfs_mount_rw(struct super_block *sb, int remount) |
240 | { | 240 | { |
241 | struct jfs_sb_info *sbi = JFS_SBI(sb); | 241 | struct jfs_sb_info *sbi = JFS_SBI(sb); |
242 | int rc; | 242 | int rc; |
243 | 243 | ||
244 | /* | 244 | /* |
@@ -291,7 +291,7 @@ int jfs_mount_rw(struct super_block *sb, int remount) | |||
291 | /* | 291 | /* |
292 | * chkSuper() | 292 | * chkSuper() |
293 | * | 293 | * |
294 | * validate the superblock of the file system to be mounted and | 294 | * validate the superblock of the file system to be mounted and |
295 | * get the file system parameters. | 295 | * get the file system parameters. |
296 | * | 296 | * |
297 | * returns | 297 | * returns |
@@ -426,7 +426,7 @@ int updateSuper(struct super_block *sb, uint state) | |||
426 | jfs_err("updateSuper: bad state"); | 426 | jfs_err("updateSuper: bad state"); |
427 | } else if (sbi->state == FM_DIRTY) | 427 | } else if (sbi->state == FM_DIRTY) |
428 | return 0; | 428 | return 0; |
429 | 429 | ||
430 | if ((rc = readSuper(sb, &bh))) | 430 | if ((rc = readSuper(sb, &bh))) |
431 | return rc; | 431 | return rc; |
432 | 432 | ||
@@ -486,9 +486,9 @@ int readSuper(struct super_block *sb, struct buffer_head **bpp) | |||
486 | * for this file system past this point in log. | 486 | * for this file system past this point in log. |
487 | * it is harmless if mount fails. | 487 | * it is harmless if mount fails. |
488 | * | 488 | * |
489 | * note: MOUNT record is at aggregate level, not at fileset level, | 489 | * note: MOUNT record is at aggregate level, not at fileset level, |
490 | * since log records of previous mounts of a fileset | 490 | * since log records of previous mounts of a fileset |
491 | * (e.g., AFTER record of extent allocation) have to be processed | 491 | * (e.g., AFTER record of extent allocation) have to be processed |
492 | * to update block allocation map at aggregate level. | 492 | * to update block allocation map at aggregate level. |
493 | */ | 493 | */ |
494 | static int logMOUNT(struct super_block *sb) | 494 | static int logMOUNT(struct super_block *sb) |