diff options
| author | trasz <trasz@FreeBSD.org> | 2009-02-23 20:56:27 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2009-02-23 20:56:27 +0000 |
| commit | 40c2eac6aa3328ce690020e0325867fd0ee36d1c (patch) | |
| tree | 3d93b1d3083077b0ce60936af6f6b2c8860be1ac /sys/ufs/ffs/ffs_vfsops.c | |
| parent | 28bdf866e39be5754cc2a11b6a5c2a0ab9d7f6d4 (diff) | |
| download | FreeBSD-src-40c2eac6aa3328ce690020e0325867fd0ee36d1c.zip FreeBSD-src-40c2eac6aa3328ce690020e0325867fd0ee36d1c.tar.gz | |
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
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 95dbeb1..d930404 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -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", |
