diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/block_dev.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 6 |
1 files changed, 1 insertions, 5 deletions
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]; |