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/adfs | |
parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) |
Merge with Linux 2.3.9.
Diffstat (limited to 'fs/adfs')
-rw-r--r-- | fs/adfs/dir.c | 6 | ||||
-rw-r--r-- | fs/adfs/file.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index 738bb40b8..0d0d11a06 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c @@ -51,12 +51,14 @@ struct inode_operations adfs_dir_inode_operations = { NULL, /* rename */ NULL, /* read link */ NULL, /* follow link */ + NULL, /* get_block */ NULL, /* read page */ NULL, /* write page */ - NULL, /* bmap */ + NULL, /* flush page */ NULL, /* truncate */ NULL, /* permission */ - NULL /* smap */ + NULL, /* smap */ + NULL /* revalidate */ }; unsigned int adfs_val (unsigned char *p, int len) diff --git a/fs/adfs/file.c b/fs/adfs/file.c index a886c68ce..c415597e3 100644 --- a/fs/adfs/file.c +++ b/fs/adfs/file.c @@ -61,10 +61,12 @@ struct inode_operations adfs_file_inode_operations = { NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - generic_readpage, /* readpage */ + adfs_bmap, /* get_block */ + block_read_full_page, /* readpage */ NULL, /* writepage */ - adfs_bmap, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ NULL, /* permission */ - NULL /* smap */ + NULL, /* smap */ + NULL /* revalidate */ }; |