summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/ufs/ffs/ffs_alloc.c8
-rw-r--r--sys/ufs/ffs/ffs_subr.c10
2 files changed, 7 insertions, 11 deletions
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 9f73216abe7..dbfe87585eb 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_alloc.c,v 1.67 2006/12/28 20:33:24 thib Exp $ */
+/* $OpenBSD: ffs_alloc.c,v 1.68 2007/01/06 23:30:42 tedu Exp $ */
/* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */
/*
@@ -240,7 +240,7 @@ ffs_realloccg(struct inode *ip, daddr_t lbprev, daddr_t bpref, int osize,
*/
if (bpref >= fs->fs_size)
bpref = 0;
- switch ((int)fs->fs_optim) {
+ switch (fs->fs_optim) {
case FS_OPTSPACE:
/*
* Allocate an exact sized fragment. Although this makes
@@ -254,8 +254,6 @@ ffs_realloccg(struct inode *ip, daddr_t lbprev, daddr_t bpref, int osize,
fs->fs_cstotal.cs_nffree >
fs->fs_dsize * fs->fs_minfree / (2 * 100))
break;
- log(LOG_NOTICE, "%s: optimization changed from SPACE to TIME\n",
- fs->fs_fsmnt);
fs->fs_optim = FS_OPTTIME;
break;
case FS_OPTTIME:
@@ -273,8 +271,6 @@ ffs_realloccg(struct inode *ip, daddr_t lbprev, daddr_t bpref, int osize,
if (fs->fs_cstotal.cs_nffree <
fs->fs_dsize * (fs->fs_minfree - 2) / 100)
break;
- log(LOG_NOTICE, "%s: optimization changed from TIME to SPACE\n",
- fs->fs_fsmnt);
fs->fs_optim = FS_OPTSPACE;
break;
default:
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index e41c52218c7..3a6d55d89bd 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_subr.c,v 1.18 2006/06/17 16:30:58 miod Exp $ */
+/* $OpenBSD: ffs_subr.c,v 1.19 2007/01/06 23:30:42 tedu Exp $ */
/* $NetBSD: ffs_subr.c,v 1.6 1996/03/17 02:16:23 christos Exp $ */
/*
@@ -160,7 +160,7 @@ ffs_isblock(struct fs *fs, unsigned char *cp, daddr_t h)
{
unsigned char mask;
- switch ((int)fs->fs_frag) {
+ switch (fs->fs_frag) {
default:
case 8:
return (cp[h] == 0xff);
@@ -183,7 +183,7 @@ void
ffs_clrblock(struct fs *fs, u_char *cp, daddr_t h)
{
- switch ((int)fs->fs_frag) {
+ switch (fs->fs_frag) {
default:
case 8:
cp[h] = 0;
@@ -207,7 +207,7 @@ void
ffs_setblock(struct fs *fs, unsigned char *cp, daddr_t h)
{
- switch ((int)fs->fs_frag) {
+ switch (fs->fs_frag) {
default:
case 8:
cp[h] = 0xff;
@@ -231,7 +231,7 @@ int
ffs_isfreeblock(struct fs *fs, unsigned char *cp, daddr_t h)
{
- switch ((int)fs->fs_frag) {
+ switch (fs->fs_frag) {
default:
case 8:
return (cp[h] == 0);