Author: trasz
Date: Mon Feb 23 20:56:27 2009
New Revision: 188954
URL: http://svn.freebsd.org/changeset/base/188954
Log:
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
Modified:
head/sys/ufs/ffs/ffs_vfsops.c
Modified: head/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- head/sys/ufs/ffs/ffs_vfsops.c Mon Feb 23 19:58:35 2009
(r188953)
+++ head/sys/ufs/ffs/ffs_vfsops.c Mon Feb 23 20:56:27 2009
(r188954)
@@ -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",
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
