patch-2.3.48 linux/fs/affs/namei.c

Next file: linux/fs/affs/super.c
Previous file: linux/fs/affs/inode.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.47/linux/fs/affs/namei.c linux/fs/affs/namei.c
@@ -274,9 +274,11 @@
 
 	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;
+		inode->i_op = &affs_file_inode_operations;
+		inode->i_fop = &affs_file_operations_ofs;
 	else {
 		inode->i_op = &affs_file_inode_operations;
+		inode->i_fop = &affs_file_operations;
 		inode->i_mapping->a_ops = &affs_aops;
 		inode->u.affs_i.mmu_private = inode->i_size;
 	}
@@ -314,6 +316,7 @@
 		goto out;
 
 	inode->i_op = &affs_dir_inode_operations;
+	inode->i_fop = &affs_dir_operations;
 	error       = affs_add_entry(dir,NULL,inode,dentry,ST_USERDIR);
 	if (error)
 		goto out_iput;
@@ -403,7 +406,7 @@
 	if (!inode)
 		goto out;
 
-	inode->i_op = &page_symlink_inode_operations;
+	inode->i_op = &affs_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);
@@ -495,6 +498,7 @@
 		goto out;
 
 	inode->i_op                = oldinode->i_op;
+	inode->i_fop               = oldinode->i_fop;
 	inode->u.affs_i.i_protect  = mode_to_prot(oldinode->i_mode);
 	inode->u.affs_i.i_original = oldinode->i_ino;
 	inode->u.affs_i.i_hlink    = 1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)