Patch: linux-2.1.0/drivers/block/rd.c

Julian Thompson (jrt@miel.demon.co.uk)
Mon, 30 Sep 1996 19:37:24 +0100 (BST)


Hi,

I had to apply the following patch in order to compile the "official"
2.1.0 kernel when using the ramdisk. The comments also contained
references to lseek, but I didn't change them as they don't appear to
have changed elsewhere :-)

Regards,
Julian

=========================== snip ===============================
--- drivres/block/rd.c.orig Tue Jul 2 17:08:41 1996
+++ drivres/block/rd.c Mon Sep 30 19:24:06 1996
@@ -350,8 +350,8 @@
/*
* Read block 0 to test for gzipped kernel
*/
- if (fp->f_op->lseek)
- fp->f_op->lseek(fp->f_inode, fp, start_block * BLOCK_SIZE, 0);
+ if (fp->f_op->llseek)
+ fp->f_op->llseek(fp->f_inode, fp, start_block * BLOCK_SIZE, 0);
fp->f_pos = start_block * BLOCK_SIZE;

fp->f_op->read(fp->f_inode, fp, buf, size);
@@ -370,8 +370,8 @@
/*
* Read block 1 to test for minix and ext2 superblock
*/
- if (fp->f_op->lseek)
- fp->f_op->lseek(fp->f_inode, fp,
+ if (fp->f_op->llseek)
+ fp->f_op->llseek(fp->f_inode, fp,
(start_block+1) * BLOCK_SIZE, 0);
fp->f_pos = (start_block+1) * BLOCK_SIZE;

@@ -400,8 +400,8 @@
start_block);

done:
- if (fp->f_op->lseek)
- fp->f_op->lseek(fp->f_inode, fp, start_block * BLOCK_SIZE, 0);
+ if (fp->f_op->llseek)
+ fp->f_op->llseek(fp->f_inode, fp, start_block * BLOCK_SIZE, 0);
fp->f_pos = start_block * BLOCK_SIZE;

if ((nblocks > 0) && blk_size[MAJOR(device)]) {
=========================== snip ===============================

-- 
Julian Thompson (jrt@miel.demon.co.uk)