diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
| commit | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch) | |
| tree | 217f87a997699505e0dd752931409b9f10fffe65 /fs/ext2/file.c | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'fs/ext2/file.c')
| -rw-r--r-- | fs/ext2/file.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index d632133f1..b5f55efd6 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -36,7 +36,7 @@ #include <linux/fs.h> #include <linux/ext2_fs.h> -static long long ext2_file_lseek(struct inode *, struct file *, long long, int); +static long long ext2_file_lseek(struct file *, long long, int); static long ext2_file_write (struct inode *, struct file *, const char *, unsigned long); static int ext2_release_file (struct inode *, struct file *); @@ -84,12 +84,13 @@ struct inode_operations ext2_file_inode_operations = { /* * Make sure the offset never goes beyond the 32-bit mark.. */ -static long long ext2_file_lseek(struct inode *inode, +static long long ext2_file_lseek( struct file *file, long long offset, int origin) { long long retval; + struct inode *inode = file->f_dentry->d_inode; switch (origin) { case 2: |