diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /fs/affs | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/dir.c | 3 | ||||
| -rw-r--r-- | fs/affs/file.c | 8 | ||||
| -rw-r--r-- | fs/affs/symlink.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/fs/affs/dir.c b/fs/affs/dir.c index ee08ff451..b88eac770 100644 --- a/fs/affs/dir.c +++ b/fs/affs/dir.c @@ -57,9 +57,10 @@ struct inode_operations affs_dir_inode_operations = { affs_rename, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ NULL, /* permissions */ NULL, /* smap */ diff --git a/fs/affs/file.c b/fs/affs/file.c index bb1ce69c8..358c1c56c 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -74,9 +74,10 @@ struct inode_operations affs_file_inode_operations = { NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - generic_readpage, /* readpage */ + affs_bmap, /* get_block */ + block_read_full_page, /* readpage */ NULL, /* writepage */ - affs_bmap, /* bmap */ + NULL, /* flushpage */ affs_truncate, /* truncate */ NULL, /* permission */ NULL, /* smap */ @@ -114,9 +115,10 @@ struct inode_operations affs_file_inode_operations_ofs = { NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ affs_truncate, /* truncate */ NULL, /* permission */ NULL, /* smap */ diff --git a/fs/affs/symlink.c b/fs/affs/symlink.c index c3da66d40..18c03730f 100644 --- a/fs/affs/symlink.c +++ b/fs/affs/symlink.c @@ -35,12 +35,14 @@ struct inode_operations affs_symlink_inode_operations = { NULL, /* rename */ affs_readlink, /* readlink */ affs_follow_link, /* follow_link */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ NULL, /* permission */ - NULL /* smap */ + NULL, /* smap */ + NULL /* revalidate */ }; static int |