diff options
| author | mckusick <mckusick@FreeBSD.org> | 2011-07-30 00:43:18 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2011-07-30 00:43:18 +0000 |
| commit | 7a7c3b6e78c347dbbc2ca8360853a5c0000d66af (patch) | |
| tree | a6f176e9f360e6601aa3c623c7984db6df633c75 /sys/ufs/ffs/ffs_alloc.c | |
| parent | 9494715d4b3d5d10e2451c54bcb68a5f91c6e5f5 (diff) | |
| download | FreeBSD-src-7a7c3b6e78c347dbbc2ca8360853a5c0000d66af.zip FreeBSD-src-7a7c3b6e78c347dbbc2ca8360853a5c0000d66af.tar.gz | |
Update to -r224294 to ensure that only one of MNT_SUJ or MNT_SOFTDEP
is set so that mount can revert back to using MNT_NOWAIT when doing
getmntinfo.
Approved by: re (kib)
Diffstat (limited to 'sys/ufs/ffs/ffs_alloc.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 283db17..f6d0366 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1967,7 +1967,7 @@ ffs_blkfree_cg(ump, fs, devvp, bno, size, inum, dephd) ACTIVECLEAR(fs, cg); UFS_UNLOCK(ump); mp = UFSTOVFS(ump); - if (mp->mnt_flag & MNT_SOFTDEP && devvp->v_type != VREG) + if (MOUNTEDSOFTDEP(mp) && devvp->v_type != VREG) softdep_setup_blkfree(UFSTOVFS(ump), bp, bno, numfrags(fs, size), dephd); bdwrite(bp); @@ -2217,7 +2217,7 @@ ffs_freefile(ump, fs, devvp, ino, mode, wkhd) fs->fs_fmod = 1; ACTIVECLEAR(fs, cg); UFS_UNLOCK(ump); - if (UFSTOVFS(ump)->mnt_flag & MNT_SOFTDEP && devvp->v_type != VREG) + if (MOUNTEDSOFTDEP(UFSTOVFS(ump)) && devvp->v_type != VREG) softdep_setup_inofree(UFSTOVFS(ump), bp, ino + cg * fs->fs_ipg, wkhd); bdwrite(bp); |
