OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: BUG_ON fix: check if page has buffers before calling page_buffers()
This commit is contained in:
Linus Torvalds 2010-10-28 15:46:57 -07:00
parent c9e2a72ff1 b1142e8fec
commit 671f837a04
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/ext4/inode.c
View File

@ -2718,7 +2718,7 @@ static int ext4_writepage(struct page *page,
* try to create them using __block_write_begin. If this * try to create them using __block_write_begin. If this
* fails, redirty the page and move on. * fails, redirty the page and move on.
*/ */
if (!page_buffers(page)) { if (!page_has_buffers(page)) {
if (__block_write_begin(page, 0, len, if (__block_write_begin(page, 0, len,
noalloc_get_block_write)) { noalloc_get_block_write)) {
redirty_page: redirty_page:
@ -2732,12 +2732,10 @@ static int ext4_writepage(struct page *page,
if (walk_page_buffers(NULL, page_bufs, 0, len, NULL, if (walk_page_buffers(NULL, page_bufs, 0, len, NULL,
ext4_bh_delay_or_unwritten)) { ext4_bh_delay_or_unwritten)) {
/* /*
* We don't want to do block allocation So redirty the * We don't want to do block allocation, so redirty
* page and return We may reach here when we do a * the page and return. We may reach here when we do
* journal commit via * a journal commit via journal_submit_inode_data_buffers.
* journal_submit_inode_data_buffers. If we don't * We can also reach here via shrink_page_list
* have mapping block we just ignore them. We can also
* reach here via shrink_page_list
*/ */
goto redirty_page; goto redirty_page;
} }