From 8624512aa908741ba2795200133eae0d7f4557ea Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 2 Mar 2000 02:36:47 +0000
Subject: Merge with 2.3.48.

---
 fs/block_dev.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'fs/block_dev.c')

diff --git a/fs/block_dev.c b/fs/block_dev.c
index b5d665c29..c455a735d 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -193,7 +193,7 @@ ssize_t block_read(struct file * filp, char * buf, size_t count, loff_t *ppos)
 	if (blk_size[MAJOR(dev)])
 		size = (loff_t) blk_size[MAJOR(dev)][MINOR(dev)] << BLOCK_SIZE_BITS;
 	else
-		size = INT_MAX;
+		size = (loff_t) INT_MAX << BLOCK_SIZE_BITS;
 
 	if (offset > size)
 		left = 0;
@@ -672,10 +672,6 @@ struct file_operations def_blk_fops = {
 	ioctl:		blkdev_ioctl,
 };
 
-struct inode_operations blkdev_inode_operations = {
-	&def_blk_fops,		/* default file operations */
-};
-
 const char * bdevname(kdev_t dev)
 {
 	static char buffer[32];
-- 
cgit v1.2.3