diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /fs/hfs/file.c | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'fs/hfs/file.c')
| -rw-r--r-- | fs/hfs/file.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/fs/hfs/file.c b/fs/hfs/file.c index d5edeac45..bb0868fca 100644 --- a/fs/hfs/file.c +++ b/fs/hfs/file.c @@ -28,24 +28,14 @@ static hfs_rwret_t hfs_file_read(struct file *, char *, hfs_rwarg_t, static hfs_rwret_t hfs_file_write(struct file *, const char *, hfs_rwarg_t, loff_t *); static void hfs_file_truncate(struct inode *); -static int hfs_get_block(struct inode *, long, struct buffer_head *, int); /*================ Global variables ================*/ static struct file_operations hfs_file_operations = { - NULL, /* lseek - default */ - hfs_file_read, /* read */ - hfs_file_write, /* write */ - NULL, /* readdir - bad */ - NULL, /* select - default */ - NULL, /* ioctl - default */ - generic_file_mmap, /* mmap */ - NULL, /* open */ - NULL, /* flush */ - NULL, /* release */ - file_fsync, /* fsync - default */ - NULL, /* fasync - default */ - NULL /* lock - none */ + read: hfs_file_read, + write: hfs_file_write, + mmap: generic_file_mmap, + fsync: file_fsync, }; struct inode_operations hfs_file_inode_operations = { @@ -61,12 +51,7 @@ struct inode_operations hfs_file_inode_operations = { NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - hfs_get_block, /* get_block */ - block_read_full_page, /* readpage */ - NULL, /* writepage */ hfs_file_truncate, /* truncate */ - NULL, /* permission */ - NULL /* revalidate */ }; /*================ Variable-like macros ================*/ |