patch-2.3.48 linux/fs/adfs/inode.c

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

diff -u --recursive --new-file v2.3.47/linux/fs/adfs/inode.c linux/fs/adfs/inode.c
@@ -283,10 +283,12 @@
 	inode->i_atime	 =
 	inode->i_ctime	 = adfs_adfs2unix_time(inode);
 
-	if (S_ISDIR(inode->i_mode))
+	if (S_ISDIR(inode->i_mode)) {
 		inode->i_op	= &adfs_dir_inode_operations;
-	else if (S_ISREG(inode->i_mode)) {
+		inode->i_fop	= &adfs_dir_operations;
+	} else if (S_ISREG(inode->i_mode)) {
 		inode->i_op	= &adfs_file_inode_operations;
+		inode->i_fop	= &adfs_file_operations;
 		inode->i_mapping->a_ops = &adfs_aops;
 		inode->u.adfs_i.mmu_private = inode->i_size;
 	}
@@ -295,17 +297,6 @@
 
 out:
 	return inode;
-}
-
-/*
- * This is no longer a valid way to obtain the metadata associated with the
- * inode number on this filesystem.  This means that this filesystem cannot
- * be shared via NFS.
- */
-void adfs_read_inode(struct inode *inode)
-{
-	adfs_error(inode->i_sb, "unsupported method of reading inode");
-	make_bad_inode(inode);
 }
 
 /*

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