summaryrefslogtreecommitdiffstats
path: root/fs/efs/inode.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
commit529c593ece216e4aaffd36bd940cb94f1fa63129 (patch)
tree78f1c0b805f5656aa7b0417a043c5346f700a2cf /fs/efs/inode.c
parent0bd079751d25808d1972baee5c4eaa1db2227257 (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/efs/inode.c')
-rw-r--r--fs/efs/inode.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/fs/efs/inode.c b/fs/efs/inode.c
index 75903be12..0206ae6d5 100644
--- a/fs/efs/inode.c
+++ b/fs/efs/inode.c
@@ -10,6 +10,20 @@
#include <linux/efs_fs.h>
#include <linux/efs_fs_sb.h>
+extern int efs_get_block(struct inode *, long, struct buffer_head *, int);
+static int efs_readpage(struct dentry *dentry, struct page *page)
+{
+ return block_read_full_page(page,efs_get_block);
+}
+static int _efs_bmap(struct address_space *mapping, long block)
+{
+ return generic_block_bmap(mapping,block,efs_get_block);
+}
+struct address_space_operations efs_aops = {
+ readpage: efs_readpage,
+ bmap: _efs_bmap
+};
+
static inline void extent_copy(efs_extent *src, efs_extent *dst) {
/*
* this is slightly evil. it doesn't just copy
@@ -126,9 +140,11 @@ void efs_read_inode(struct inode *inode) {
break;
case S_IFREG:
inode->i_op = &efs_file_inode_operations;
+ inode->i_data.a_ops = &efs_aops;
break;
case S_IFLNK:
- inode->i_op = &efs_symlink_inode_operations;
+ inode->i_op = &page_symlink_inode_operations;
+ inode->i_data.a_ops = &efs_symlink_aops;
break;
case S_IFCHR:
case S_IFBLK: