diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /fs/udf | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/file.c | 2 | ||||
| -rw-r--r-- | fs/udf/inode.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 7e8ac9b7d..3895d769b 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -67,7 +67,7 @@ static int udf_adinicb_readpage(struct file *file, struct page * page) return 0; } -static int udf_adinicb_writepage(struct file *file, struct page *page) +static int udf_adinicb_writepage(struct page *page) { struct inode *inode = (struct inode *)page->mapping->host; diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 83a34f258..3783b43fd 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -125,7 +125,7 @@ void udf_discard_prealloc(struct inode * inode) udf_trunc(inode); } -static int udf_writepage(struct file *file, struct page *page) +static int udf_writepage(struct page *page) { return block_write_full_page(page, udf_get_block); } @@ -202,7 +202,7 @@ void udf_expand_file_adinicb(struct inode * inode, int newsize, int * err) mark_buffer_dirty(bh); udf_release_data(bh); - inode->i_data.a_ops->writepage(NULL, page); + inode->i_data.a_ops->writepage(page); UnlockPage(page); page_cache_release(page); |