From 9b7cc97f6c4d6a142181f64a7b57721de50d0be8 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Tue, 26 Oct 2004 06:53:00 +0000 Subject: [PATCH] Remove unused si_bsize_best field from struct cdev. --- sys/kern/vfs_vnops.c | 4 +--- sys/sys/conf.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index c9d30e9f45b2..7110bc4369e3 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -739,9 +739,7 @@ vn_stat(vp, sb, active_cred, file_cred, td) if (vap->va_type == VREG) { sb->st_blksize = vap->va_blocksize; } else if (vn_isdisk(vp, NULL)) { - sb->st_blksize = vp->v_rdev->si_bsize_best; - if (sb->st_blksize < vp->v_rdev->si_bsize_phys) - sb->st_blksize = vp->v_rdev->si_bsize_phys; + sb->st_blksize = vp->v_rdev->si_bsize_phys; if (sb->st_blksize < BLKDEV_IOSIZE) sb->st_blksize = BLKDEV_IOSIZE; } else { diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 8c1ee2516f87..02b7ba67a004 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -92,7 +92,6 @@ struct cdev { struct { struct mount *__sid_mountpoint; int __sid_bsize_phys; /* min physical block size */ - int __sid_bsize_best; /* optimal block size */ struct snapdata *__sid_snapdata; } __si_disk; } __si_u; @@ -102,7 +101,6 @@ struct cdev { #define si_tty __si_u.__si_tty.__sit_tty #define si_mountpoint __si_u.__si_disk.__sid_mountpoint #define si_bsize_phys __si_u.__si_disk.__sid_bsize_phys -#define si_bsize_best __si_u.__si_disk.__sid_bsize_best #define si_snapdata __si_u.__si_disk.__sid_snapdata #ifdef _KERNEL