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.

8 files changed, 0 insertions, 66 deletions

diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 238695d..0e51db4 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -102,7 +102,6 @@ static	d_strategy_t	vnstrategy;
 /*
  * cdevsw
  *	D_DISK		we want to look like a disk
- *	( D_NOCLUSTERRW	 removed - clustering should be ok )
  *	D_CANFREE	We support B_FREEBUF
  */
 
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 050e99e..6fa36f4 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -185,8 +185,6 @@ cd9660_mount(mp, path, data, ndp, p)
 	struct iso_mnt *imp = 0;
 
 	if ((mp->mnt_flag & MNT_ROOTFS) != 0) {
-		if (devsw(rootdev)->d_flags & D_NOCLUSTERR)
-			mp->mnt_flag |= MNT_NOCLUSTERR;
 		return (iso_mountroot(mp, p));
 	}
 	if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args))))
@@ -198,13 +196,9 @@ cd9660_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 flag, if block device requests.
 	 */
 	if (mp->mnt_flag & MNT_UPDATE) {
 		imp = VFSTOISOFS(mp);
-		if (devsw(imp->im_devvp->v_rdev)->d_flags &
-		    D_NOCLUSTERR)
-			mp->mnt_flag |= MNT_NOCLUSTERR;
 		if (args.fspec == 0)
 			return (vfs_export(mp, &imp->im_export, &args.export));
 	}
@@ -238,8 +232,6 @@ cd9660_mount(mp, path, data, ndp, p)
 	VOP_UNLOCK(devvp, 0, p);
 
 	if ((mp->mnt_flag & MNT_UPDATE) == 0) {
-		if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERR)
-			mp->mnt_flag |= MNT_NOCLUSTERR;
 		error = iso_mountfs(devvp, mp, p, &args);
 	} else {
 		if (devvp != imp->im_devvp)
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 7da44f9..4d68ecb 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 7da44f9..4d68ecb 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)
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 050e99e..6fa36f4 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -185,8 +185,6 @@ cd9660_mount(mp, path, data, ndp, p)
 	struct iso_mnt *imp = 0;
 
 	if ((mp->mnt_flag & MNT_ROOTFS) != 0) {
-		if (devsw(rootdev)->d_flags & D_NOCLUSTERR)
-			mp->mnt_flag |= MNT_NOCLUSTERR;
 		return (iso_mountroot(mp, p));
 	}
 	if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args))))
@@ -198,13 +196,9 @@ cd9660_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 flag, if block device requests.
 	 */
 	if (mp->mnt_flag & MNT_UPDATE) {
 		imp = VFSTOISOFS(mp);
-		if (devsw(imp->im_devvp->v_rdev)->d_flags &
-		    D_NOCLUSTERR)
-			mp->mnt_flag |= MNT_NOCLUSTERR;
 		if (args.fspec == 0)
 			return (vfs_export(mp, &imp->im_export, &args.export));
 	}
@@ -238,8 +232,6 @@ cd9660_mount(mp, path, data, ndp, p)
 	VOP_UNLOCK(devvp, 0, p);
 
 	if ((mp->mnt_flag & MNT_UPDATE) == 0) {
-		if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERR)
-			mp->mnt_flag |= MNT_NOCLUSTERR;
 		error = iso_mountfs(devvp, mp, p, &args);
 	} else {
 		if (devvp != imp->im_devvp)
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 804f1c1..77e7c6e 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -151,9 +151,6 @@ typedef void devfs_remove_t __P((dev_t dev));
 /*
  * Flags for d_flags.
  */
-#define	D_NOCLUSTERR	0x10000		/* disables cluter read */
-#define	D_NOCLUSTERW	0x20000		/* disables cluster write */
-#define	D_NOCLUSTERRW	(D_NOCLUSTERR | D_NOCLUSTERW)
 #define	D_CANFREE	0x40000		/* can free blocks */
 #define	D_TRACKCLOSE	0x80000		/* track all closes */
 
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 804f1c1..77e7c6e 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -151,9 +151,6 @@ typedef void devfs_remove_t __P((dev_t dev));
 /*
  * Flags for d_flags.
  */
-#define	D_NOCLUSTERR	0x10000		/* disables cluter read */
-#define	D_NOCLUSTERW	0x20000		/* disables cluster write */
-#define	D_NOCLUSTERRW	(D_NOCLUSTERR | D_NOCLUSTERW)
 #define	D_CANFREE	0x40000		/* can free blocks */
 #define	D_TRACKCLOSE	0x80000		/* track all closes */
 
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 2ec065f..16c4914 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -157,10 +157,6 @@ ffs_mount( mp, path, data, ndp, p)
 			return (err);
 		}
 
-		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( ( err = ffs_mountfs(rootvp, mp, p, M_FFSNODE)) != 0) {
 			/* fs specific cleanup (if any)*/
 			goto error_1;
@@ -184,8 +180,6 @@ ffs_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);
@@ -193,10 +187,6 @@ ffs_mount( mp, path, data, ndp, p)
 		devvp = ump->um_devvp;
 		err = 0;
 		ronly = fs->fs_ronly;	/* MNT_RELOAD might change this */
-		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 (ronly == 0 && (mp->mnt_flag & MNT_RDONLY)) {
 			flags = WRITECLOSE;
 			if (mp->mnt_flag & MNT_FORCE)
@@ -341,11 +331,6 @@ ffs_mount( mp, path, data, ndp, p)
 		 ********************
 		 */
 
-		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;
-
 		/*
 		 * Since this is a new mount, we want the names for
 		 * the device and the mount point copied in.  If an