From: wessels <>
Date: Fri, 5 Jan 2001 07:28:22 +0000 (+0000)
Subject: Argh, the FS blocksize code assumed that blocksize would always be
X-Git-Tag: SQUID_3_0_PRE1~1693
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e3019d658c867f9412b90515f4be94312e9ed81;p=thirdparty%2Fsquid.git

Argh, the FS blocksize code assumed that blocksize would always be
1K or greater.  If the blocksize is 512 bytes, the 'kperblk' variable
would be set to zero, which screws up cache size calculations.
---

diff --git a/src/fs/aufs/store_dir_aufs.cc b/src/fs/aufs/store_dir_aufs.cc
index 4f7eb6779f..6d3624b885 100644
--- a/src/fs/aufs/store_dir_aufs.cc
+++ b/src/fs/aufs/store_dir_aufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_aufs.cc,v 1.23 2001/01/02 01:41:33 wessels Exp $
+ * $Id: store_dir_aufs.cc,v 1.24 2001/01/05 00:28:22 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -372,6 +372,8 @@ storeAufsDirInit(SwapDir * sd)
     }
     if (0 == storeDirGetBlkSize(sd->path, &sd->fs.blksize))
 	sd->fs.kperblk = sd->fs.blksize >> 10;
+    if (sd->fs.kperblk < 1)
+	sd->fs.kperblk = 1;
 }
 
 static void
diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index 72e7f58c63..9c9b2b41da 100644
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_coss.cc,v 1.13 2001/01/02 01:41:34 wessels Exp $
+ * $Id: store_dir_coss.cc,v 1.14 2001/01/05 00:28:26 wessels Exp $
  *
  * DEBUG: section 81    Store COSS Directory Routines
  * AUTHOR: Eric Stern
@@ -155,6 +155,8 @@ storeCossDirInit(SwapDir * sd)
     n_coss_dirs++;
     if (0 == storeDirGetBlkSize(sd->path, &sd->fs.blksize))
 	sd->fs.kperblk = sd->fs.blksize >> 10;
+    if (sd->fs.kperblk < 1)
+	sd->fs.kperblk = 1;
 }
 
 void
diff --git a/src/fs/diskd/store_dir_diskd.cc b/src/fs/diskd/store_dir_diskd.cc
index a4f62295c3..de830163f0 100644
--- a/src/fs/diskd/store_dir_diskd.cc
+++ b/src/fs/diskd/store_dir_diskd.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_diskd.cc,v 1.30 2001/01/02 01:41:34 wessels Exp $
+ * $Id: store_dir_diskd.cc,v 1.31 2001/01/05 00:28:26 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -443,6 +443,8 @@ storeDiskdDirInit(SwapDir * sd)
     }
     if (0 == storeDirGetBlkSize(sd->path, &sd->fs.blksize))
 	sd->fs.kperblk = sd->fs.blksize >> 10;
+    if (sd->fs.kperblk < 1)
+	sd->fs.kperblk = 1;
 }
 
 
diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc
index 0db450a9f7..b8e2fa7e4c 100644
--- a/src/fs/ufs/store_dir_ufs.cc
+++ b/src/fs/ufs/store_dir_ufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_ufs.cc,v 1.22 2001/01/04 03:42:38 wessels Exp $
+ * $Id: store_dir_ufs.cc,v 1.23 2001/01/05 00:28:27 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -370,6 +370,8 @@ storeUfsDirInit(SwapDir * sd)
     }
     if (0 == storeDirGetBlkSize(sd->path, &sd->fs.blksize))
 	sd->fs.kperblk = sd->fs.blksize >> 10;
+    if (sd->fs.kperblk < 1)
+	sd->fs.kperblk = 1;
 }
 
 static void