Refactor, moving error checking outside of the

'if (mp->mnt_flag & MNT_SOFTDEP)' conditional.  No functional
changes.

Reviewed by:	kib
Approved by:	rwatson (mentor)
Tested by:	pho
Sponsored by:	FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2009-02-23 20:56:27 +00:00
parent 539fe40650
commit 3c140b2df4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=188954

View file

@ -1075,13 +1075,13 @@ ffs_unmount(mp, mntflags, td)
vn_start_write(NULL, &mp, V_WAIT);
}
}
if (mp->mnt_flag & MNT_SOFTDEP) {
if ((error = softdep_flushfiles(mp, flags, td)) != 0)
goto fail;
} else {
if ((error = ffs_flushfiles(mp, flags, td)) != 0)
goto fail;
}
if (mp->mnt_flag & MNT_SOFTDEP)
error = softdep_flushfiles(mp, flags, td);
else
error = ffs_flushfiles(mp, flags, td);
if (error != 0)
goto fail;
UFS_LOCK(ump);
if (fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) {
printf("%s: unmount pending error: blocks %jd files %d\n",