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/coda | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'fs/coda')
| -rw-r--r-- | fs/coda/dir.c | 3 | ||||
| -rw-r--r-- | fs/coda/file.c | 8 | ||||
| -rw-r--r-- | fs/coda/pioctl.c | 4 | ||||
| -rw-r--r-- | fs/coda/symlink.c | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index b3c0195a3..4313edb69 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c @@ -77,9 +77,10 @@ struct inode_operations coda_dir_inode_operations = coda_rename, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ coda_permission, /* permission */ NULL, /* smap */ diff --git a/fs/coda/file.c b/fs/coda/file.c index cbc81542f..7e83ea954 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c @@ -47,13 +47,13 @@ struct inode_operations coda_file_inode_operations = { NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* get_block */ coda_readpage, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ coda_permission, /* permission */ NULL, /* smap */ - NULL, /* update page */ coda_revalidate_inode /* revalidate */ }; @@ -101,7 +101,7 @@ static int coda_readpage(struct file * coda_file, struct page * page) CDEBUG(D_INODE, "coda ino: %ld, cached ino %ld, page offset: %lx\n", coda_inode->i_ino, cii->c_ovp->i_ino, page->offset); - generic_readpage(&cont_file, page); + block_read_full_page(&cont_file, page); EXIT; return 0; } @@ -256,7 +256,7 @@ void coda_prepare_openfile(struct inode *i, struct file *coda_file, cont_file->f_pos = coda_file->f_pos; cont_file->f_mode = coda_file->f_mode; cont_file->f_flags = coda_file->f_flags; - cont_file->f_count = coda_file->f_count; + atomic_set(&cont_file->f_count, atomic_read(&coda_file->f_count)); cont_file->f_owner = coda_file->f_owner; cont_file->f_op = cont_inode->i_op->default_file_ops; cont_file->f_dentry = cont_dentry; diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index 4a98361aa..3e6924f15 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -46,13 +46,13 @@ struct inode_operations coda_ioctl_inode_operations = NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ coda_ioctl_permission, /* permission */ NULL, /* smap */ - NULL, /* update page */ NULL /* revalidate */ }; diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c index b42555811..cfe0dbcb7 100644 --- a/fs/coda/symlink.c +++ b/fs/coda/symlink.c @@ -42,13 +42,13 @@ struct inode_operations coda_symlink_inode_operations = { NULL, /* rename */ coda_readlink, /* readlink */ coda_follow_link, /* follow_link */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ NULL, /* permission */ NULL, /* smap */ - NULL, /* update page */ NULL /* revalidate */ }; |