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/nfs/file.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index d3066f4cd..2fed65b38 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -71,7 +71,7 @@ struct inode_operations nfs_file_inode_operations = { NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - NULL, /* bmap */ + NULL, /* get_block */ nfs_readpage, /* readpage */ nfs_writepage, /* writepage */ NULL, /* flushpage */ @@ -167,7 +167,7 @@ nfs_fsync(struct file *file, struct dentry *dentry) * If the writer ends up delaying the write, the writer needs to * increment the page use counts until he is done with the page. */ -static long nfs_write_one_page(struct file *file, struct page *page, unsigned long offset, unsigned long bytes, const char * buf) +static int nfs_write_one_page(struct file *file, struct page *page, unsigned long offset, unsigned long bytes, const char * buf) { long status; |