v2.1.0 drivers/block/rd.c

Thomas Roessler (roessler@sobolev.rhein.de)
1 Oct 1996 10:49:08 GMT


--- rd.c~ Fri Jul 5 13:42:11 1996
+++ rd.c Tue Oct 1 12:46:12 1996
@@ -206,7 +206,7 @@


static struct file_operations initrd_fops = {
- NULL, /* lseek */
+ NULL, /* llseek */
initrd_read, /* read */
NULL, /* write */
NULL, /* readdir */
@@ -248,7 +248,7 @@
#endif

static struct file_operations fd_fops = {
- NULL, /* lseek - default */
+ NULL, /* llseek - default */
block_read, /* read - block dev read */
block_write, /* write - block dev write */
NULL, /* readdir - not here! */
@@ -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)]) {

-- 
Thomas Roessler                  	  http://www.rhein.de/~roessler/