[PATCH] fs: nobh_truncate_page() fix
This fixes a regression caused by 22c8ca78f2
.
nobh_prepare_write() no longer marks the page uptodate, so
nobh_truncate_page() needs to do it.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
90675a27fa
commit
57bf63d69c
1 changed files with 9 additions and 0 deletions
|
@ -2365,6 +2365,10 @@ int nobh_prepare_write(struct page *page, unsigned from, unsigned to,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(nobh_prepare_write);
|
EXPORT_SYMBOL(nobh_prepare_write);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Make sure any changes to nobh_commit_write() are reflected in
|
||||||
|
* nobh_truncate_page(), since it doesn't call commit_write().
|
||||||
|
*/
|
||||||
int nobh_commit_write(struct file *file, struct page *page,
|
int nobh_commit_write(struct file *file, struct page *page,
|
||||||
unsigned from, unsigned to)
|
unsigned from, unsigned to)
|
||||||
{
|
{
|
||||||
|
@ -2466,6 +2470,11 @@ int nobh_truncate_page(struct address_space *mapping, loff_t from)
|
||||||
memset(kaddr + offset, 0, PAGE_CACHE_SIZE - offset);
|
memset(kaddr + offset, 0, PAGE_CACHE_SIZE - offset);
|
||||||
flush_dcache_page(page);
|
flush_dcache_page(page);
|
||||||
kunmap_atomic(kaddr, KM_USER0);
|
kunmap_atomic(kaddr, KM_USER0);
|
||||||
|
/*
|
||||||
|
* It would be more correct to call aops->commit_write()
|
||||||
|
* here, but this is more efficient.
|
||||||
|
*/
|
||||||
|
SetPageUptodate(page);
|
||||||
set_page_dirty(page);
|
set_page_dirty(page);
|
||||||
}
|
}
|
||||||
unlock_page(page);
|
unlock_page(page);
|
||||||
|
|
Loading…
Reference in a new issue