Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

This commit is contained in:
Felix Blyakher
2009-04-01 16:58:39 -05:00
534 changed files with 20643 additions and 13752 deletions

View File

@@ -234,9 +234,9 @@ xfs_file_mmap(
STATIC int
xfs_vm_page_mkwrite(
struct vm_area_struct *vma,
struct page *page)
struct vm_fault *vmf)
{
return block_page_mkwrite(vma, page, xfs_get_blocks);
return block_page_mkwrite(vma, vmf, xfs_get_blocks);
}
const struct file_operations xfs_file_operations = {