summaryrefslogtreecommitdiffstats
path: root/fs/adfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/adfs/inode.c')
-rw-r--r--fs/adfs/inode.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index 7a759c050..6eb08c857 100644
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -283,10 +283,12 @@ adfs_iget(struct super_block *sb, struct object_info *obj)
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;
}
@@ -298,17 +300,6 @@ out:
}
/*
- * 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);
-}
-
-/*
* Validate and convert a changed access mode/time to their ADFS equivalents.
* adfs_write_inode will actually write the information back to the directory
* later.