diff options
author | iedowse <iedowse@FreeBSD.org> | 2001-12-16 18:54:09 +0000 |
---|---|---|
committer | iedowse <iedowse@FreeBSD.org> | 2001-12-16 18:54:09 +0000 |
commit | 5c873cad57d228e70ad36d16b23b89c8b49387c7 (patch) | |
tree | 7774794979a28e8abe11caf7b0afabc827031c14 /sys/ufs | |
parent | 64972486c212456ccc0747ab609c3fec700d191d (diff) | |
download | FreeBSD-src-5c873cad57d228e70ad36d16b23b89c8b49387c7.zip FreeBSD-src-5c873cad57d228e70ad36d16b23b89c8b49387c7.tar.gz |
Make sure we ignore the value of `fs_active' when reloading the
superblock, and move the initialisation of it to beside where other
pointer fields are initialised.
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 2f4858c..d6bc8b1 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -430,6 +430,7 @@ ffs_reload(mp, cred, td) newfs->fs_csp = fs->fs_csp; newfs->fs_maxcluster = fs->fs_maxcluster; newfs->fs_contigdirs = fs->fs_contigdirs; + newfs->fs_active = fs->fs_active; bcopy(newfs, fs, (u_int)fs->fs_sbsize); if (fs->fs_sbsize < SBSIZE) bp->b_flags |= B_INVAL | B_NOCACHE; @@ -636,7 +637,6 @@ ffs_mountfs(devvp, mp, td, malloctype) fs->fs_pendingblocks = 0; fs->fs_pendinginodes = 0; } - fs->fs_active = 0; /* XXX updating 4.2 FFS superblocks trashes rotational layout tables */ if (fs->fs_postblformat == FS_42POSTBLFMT && !ronly) { error = EROFS; /* needs translation */ @@ -690,6 +690,7 @@ ffs_mountfs(devvp, mp, td, malloctype) size = fs->fs_ncg * sizeof(u_int8_t); fs->fs_contigdirs = (u_int8_t *)space; bzero(fs->fs_contigdirs, size); + fs->fs_active = NULL; /* Compatibility for old filesystems XXX */ if (fs->fs_avgfilesize <= 0) /* XXX */ fs->fs_avgfilesize = AVFILESIZ; /* XXX */ |