diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-09-30 07:11:30 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-09-30 07:11:30 +0000 |
| commit | b89392e703d5c84382872dfba236bebc6672eaa6 (patch) | |
| tree | 715265ba3f7f3ccad1bfa65e74720ec152e5610b /sys/gnu | |
| parent | 46a706dc69122a9d09f33bcfeb6169a26ca37722 (diff) | |
| download | src-b89392e703d5c84382872dfba236bebc6672eaa6.tar.gz src-b89392e703d5c84382872dfba236bebc6672eaa6.zip | |
Remove the D_NOCLUSTER[RW] options which were added because vn had
problems. Now that Matt has fixed vn, this can go. The vn driver
should have used d_maxio (now si_iosize_max) anyway.
Notes
Notes:
svn path=/head/; revision=51808
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 14 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vfsops.c | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index 7da44f920943..4d68ecb55862 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -135,10 +135,6 @@ ext2_mountroot() bzero((char *)mp, (u_long)sizeof(struct mount)); mp->mnt_op = &ext2fs_vfsops; mp->mnt_flag = MNT_RDONLY; - if (devsw(rootdev)->d_flags & D_NOCLUSTERR) - mp->mnt_flag |= MNT_NOCLUSTERR; - if (devsw(rootdev)->d_flags & D_NOCLUSTERW) - mp->mnt_flag |= MNT_NOCLUSTERW; if (error = ext2_mountfs(rootvp, mp, p)) { bsd_free(mp, M_MOUNT); return (error); @@ -193,17 +189,11 @@ ext2_mount(mp, path, data, ndp, p) /* * If updating, check whether changing from read-only to * read/write; if there is no device name, that's all we do. - * Disallow clearing MNT_NOCLUSTERR and MNT_NOCLUSTERW flags, - * if block device requests. */ if (mp->mnt_flag & MNT_UPDATE) { ump = VFSTOUFS(mp); fs = ump->um_e2fs; error = 0; - if (devsw(ump->um_dev)->d_flags & D_NOCLUSTERR) - mp->mnt_flag |= MNT_NOCLUSTERR; - if (devsw(ump->um_dev)->d_flags & D_NOCLUSTERW) - mp->mnt_flag |= MNT_NOCLUSTERW; if (fs->s_rd_only == 0 && (mp->mnt_flag & MNT_RDONLY)) { flags = WRITECLOSE; if (mp->mnt_flag & MNT_FORCE) @@ -293,10 +283,6 @@ ext2_mount(mp, path, data, ndp, p) } if ((mp->mnt_flag & MNT_UPDATE) == 0) { - if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERR) - mp->mnt_flag |= MNT_NOCLUSTERR; - if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERW) - mp->mnt_flag |= MNT_NOCLUSTERW; error = ext2_mountfs(devvp, mp, p); } else { if (devvp != ump->um_devvp) diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 7da44f920943..4d68ecb55862 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -135,10 +135,6 @@ ext2_mountroot() bzero((char *)mp, (u_long)sizeof(struct mount)); mp->mnt_op = &ext2fs_vfsops; mp->mnt_flag = MNT_RDONLY; - if (devsw(rootdev)->d_flags & D_NOCLUSTERR) - mp->mnt_flag |= MNT_NOCLUSTERR; - if (devsw(rootdev)->d_flags & D_NOCLUSTERW) - mp->mnt_flag |= MNT_NOCLUSTERW; if (error = ext2_mountfs(rootvp, mp, p)) { bsd_free(mp, M_MOUNT); return (error); @@ -193,17 +189,11 @@ ext2_mount(mp, path, data, ndp, p) /* * If updating, check whether changing from read-only to * read/write; if there is no device name, that's all we do. - * Disallow clearing MNT_NOCLUSTERR and MNT_NOCLUSTERW flags, - * if block device requests. */ if (mp->mnt_flag & MNT_UPDATE) { ump = VFSTOUFS(mp); fs = ump->um_e2fs; error = 0; - if (devsw(ump->um_dev)->d_flags & D_NOCLUSTERR) - mp->mnt_flag |= MNT_NOCLUSTERR; - if (devsw(ump->um_dev)->d_flags & D_NOCLUSTERW) - mp->mnt_flag |= MNT_NOCLUSTERW; if (fs->s_rd_only == 0 && (mp->mnt_flag & MNT_RDONLY)) { flags = WRITECLOSE; if (mp->mnt_flag & MNT_FORCE) @@ -293,10 +283,6 @@ ext2_mount(mp, path, data, ndp, p) } if ((mp->mnt_flag & MNT_UPDATE) == 0) { - if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERR) - mp->mnt_flag |= MNT_NOCLUSTERR; - if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERW) - mp->mnt_flag |= MNT_NOCLUSTERW; error = ext2_mountfs(devvp, mp, p); } else { if (devvp != ump->um_devvp) |