diff options
| author | mckusick <mckusick@FreeBSD.org> | 2011-07-24 18:27:09 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2011-07-24 18:27:09 +0000 |
| commit | ffeefed9fc8fa85d3fcbd19640ba38e51e2ff4da (patch) | |
| tree | dff2f2c8a3cdf5485267a96d12dd0c20f58da76d /sys/ufs/ffs/ffs_vfsops.c | |
| parent | 64e0ba1afe60a4c7d7a1960154875516b560d46c (diff) | |
| download | FreeBSD-src-ffeefed9fc8fa85d3fcbd19640ba38e51e2ff4da.zip FreeBSD-src-ffeefed9fc8fa85d3fcbd19640ba38e51e2ff4da.tar.gz | |
Move the MNTK_SUJ flag in mnt_kern_flag to MNT_SUJ in mnt_flag
so that it is visible to userland programs. This change enables
the `mount' command with no arguments to be able to show if a
filesystem is mounted using journaled soft updates as opposed
to just normal soft updates.
Approved by: re (bz)
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 35852bf..7f57c84 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1389,6 +1389,9 @@ ffs_statfs(mp, sbp) fs = ump->um_fs; if (fs->fs_magic != FS_UFS1_MAGIC && fs->fs_magic != FS_UFS2_MAGIC) panic("ffs_statfs"); + /* Don't export MNT_SOFTDEP when MNT_SUJ is in use */ + if ((sbp->f_flags & (MNT_SOFTDEP | MNT_SUJ)) == (MNT_SOFTDEP | MNT_SUJ)) + sbp->f_flags &= ~MNT_SOFTDEP; sbp->f_version = STATFS_VERSION; sbp->f_bsize = fs->fs_fsize; sbp->f_iosize = fs->fs_bsize; |
