summaryrefslogtreecommitdiffstats
path: root/fs/affs/namei.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/affs/namei.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/affs/namei.c')
-rw-r--r--fs/affs/namei.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index aad5b8f14..d2c27b9d1 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -275,9 +275,11 @@ affs_create(struct inode *dir, struct dentry *dentry, int mode)
pr_debug("AFFS: ino=%lu\n",inode->i_ino);
if (dir->i_sb->u.affs_sb.s_flags & SF_OFS)
inode->i_op = &affs_file_inode_operations_ofs;
- else
+ else {
inode->i_op = &affs_file_inode_operations;
-
+ inode->i_mapping->a_ops = &affs_aops;
+ inode->u.affs_i.mmu_private = inode->i_size;
+ }
error = affs_add_entry(dir,NULL,inode,dentry,ST_FILE);
if (error)
goto out_iput;
@@ -401,7 +403,8 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
if (!inode)
goto out;
- inode->i_op = &affs_symlink_inode_operations;
+ inode->i_op = &page_symlink_inode_operations;
+ inode->i_data.a_ops = &affs_symlink_aops;
inode->i_mode = S_IFLNK | 0777;
inode->u.affs_i.i_protect = mode_to_prot(inode->i_mode);
error = -EIO;