diff --git a/[refs] b/[refs] index 8f15bc62d450..7312e34914ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f663404b27fa72546a592c5c932b0605b9c93a6 +refs/heads/master: ff1be9ad61e3e17ba83702d8ed0b534e5b8ee15c diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index 49590d590d7d..aa68206bd517 100644 --- a/trunk/fs/buffer.c +++ b/trunk/fs/buffer.c @@ -2101,7 +2101,7 @@ int cont_prepare_write(struct page *page, unsigned offset, PAGE_CACHE_SIZE, get_block); if (status) goto out_unmap; - zero_user_page(page, zerofrom, PAGE_CACHE_SIZE - zerofrom, + zero_user_page(new_page, zerofrom, PAGE_CACHE_SIZE - zerofrom, KM_USER0); generic_commit_write(NULL, new_page, zerofrom, PAGE_CACHE_SIZE); unlock_page(new_page);