patch-2.4.0-test10 linux/fs/hpfs/buffer.c

• Lines: 20
• Date: Thu Oct 12 14:19:32 2000
• Orig file: v2.4.0-test9/linux/fs/hpfs/buffer.c
• Orig date: Tue Sep 5 14:07:29 2000

diff -u --recursive --new-file v2.4.0-test9/linux/fs/hpfs/buffer.c linux/fs/hpfs/buffer.c
@@ -125,8 +125,7 @@
 	kdev_t dev = s->s_dev;
 	struct buffer_head *bh;
 
-					/* vvvv - workaround for the breada bug */
-	if (!ahead || secno + ahead + (read_ahead[MAJOR(dev)] >> 9) >= s->s_hpfs_fs_size)
+	if (!ahead || secno + ahead >= s->s_hpfs_fs_size)
 		*bhp = bh = bread(dev, secno, 512);
 	else *bhp = bh = breada(dev, secno, 512, 0, (ahead + 1) << 9);
 	if (bh != NULL)
@@ -174,8 +173,7 @@
 		goto bail;
 	}
 
-					/* vvvv - workaround for the breada bug */
-	if (!ahead || secno + 4 + ahead + (read_ahead[MAJOR(dev)] >> 9) > s->s_hpfs_fs_size)
+	if (!ahead || secno + 4 + ahead > s->s_hpfs_fs_size)
 		qbh->bh[0] = bh = bread(dev, secno, 512);
 	else qbh->bh[0] = bh = breada(dev, secno, 512, 0, (ahead + 4) << 9);
 	if (!bh)