d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Third of several cleanups to soft dependency implementation.

Browse Source 
Ensure that softdep_unmount() and softdep_setup_sbupdate()
only get called for filesystems running with soft dependencies.

No functional change.

Tested by:    Peter Holm and Scott Long
Sponsored by: Netflix
This commit is contained in:
mckusick 2013-10-20 21:11:40 +00:00
parent 10e069d479
commit 54a566ac25
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/ufs/ffs/ffs_softdep.c
View File

@ -13686,6 +13686,17 @@ DB_SHOW_COMMAND(mkdirs, db_show_mkdirs)
} }
} }
/* exported to ffs_vfsops.c */
extern void db_print_ffs(struct ufsmount *ump);
void
db_print_ffs(struct ufsmount *ump)
{
db_printf("mp %p %s devvp %p fs %p su_wl %d su_deps %d su_req %d\n",
ump->um_mountp, ump->um_mountp->mnt_stat.f_mntonname,
ump->um_devvp, ump->um_fs, ump->softdep_on_worklist,
ump->softdep_deps, ump->softdep_req);
}
#endif /* DDB */ #endif /* DDB */
#endif /* SOFTUPDATES */ #endif /* SOFTUPDATES */

15
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1286,7 +1286,8 @@ ffs_unmount(mp, mntflags)
fs->fs_pendinginodes = 0; fs->fs_pendinginodes = 0;
} }
UFS_UNLOCK(ump); UFS_UNLOCK(ump);
softdep_unmount(mp); if (MOUNTEDSOFTDEP(mp))
softdep_unmount(mp);
if (fs->fs_ronly == 0 || ump->um_fsckpid > 0) { if (fs->fs_ronly == 0 || ump->um_fsckpid > 0) {
fs->fs_clean = fs->fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK) ? 0 : 1; fs->fs_clean = fs->fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK) ? 0 : 1;
error = ffs_sbupdate(ump, MNT_WAIT, 0); error = ffs_sbupdate(ump, MNT_WAIT, 0);
@ -1943,7 +1944,7 @@ ffs_sbupdate(ump, waitfor, suspended)
} }
fs->fs_fmod = 0; fs->fs_fmod = 0;
fs->fs_time = time_second; fs->fs_time = time_second;
if (fs->fs_flags & FS_DOSOFTDEP) if (MOUNTEDSOFTDEP(ump->um_mountp))
softdep_setup_sbupdate(ump, (struct fs *)bp->b_data, bp); softdep_setup_sbupdate(ump, (struct fs *)bp->b_data, bp);
bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize); bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize);
ffs_oldfscompat_write((struct fs *)bp->b_data, ump); ffs_oldfscompat_write((struct fs *)bp->b_data, ump);
@ -2221,14 +2222,8 @@ ffs_own_mount(const struct mount *mp)
#ifdef DDB #ifdef DDB
static void /* defined in ffs_softdep.c */
db_print_ffs(struct ufsmount *ump) extern void db_print_ffs(struct ufsmount *ump);
{
db_printf("mp %p %s devvp %p fs %p su_wl %d su_deps %d su_req %d\n",
ump->um_mountp, ump->um_mountp->mnt_stat.f_mntonname,
ump->um_devvp, ump->um_fs, ump->softdep_on_worklist,
ump->softdep_deps, ump->softdep_req);
}
DB_SHOW_COMMAND(ffs, db_show_ffs) DB_SHOW_COMMAND(ffs, db_show_ffs)
{ {