diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:46:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:46:57 -0700 |
| commit | 671f837a04cbcaaa10e8404989cf08ca3fdf1c80 (patch) | |
| tree | d98a55d2e347ad15a73cbd860d1fd71a61be20bd /fs/ext4 | |
| parent | c9e2a72ff1acfdffdecb338b3d997f90c507e665 (diff) | |
| parent | b1142e8fec6a594723e5054055a7b53379b90490 (diff) | |
| download | linux-3.10-671f837a04cbcaaa10e8404989cf08ca3fdf1c80.tar.gz linux-3.10-671f837a04cbcaaa10e8404989cf08ca3fdf1c80.tar.bz2 linux-3.10-671f837a04cbcaaa10e8404989cf08ca3fdf1c80.zip | |
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()
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 2d6c6c8c036..19161647046 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2718,7 +2718,7 @@ static int ext4_writepage(struct page *page, * try to create them using __block_write_begin. If this * fails, redirty the page and move on. */ - if (!page_buffers(page)) { + if (!page_has_buffers(page)) { if (__block_write_begin(page, 0, len, noalloc_get_block_write)) { redirty_page: @@ -2732,12 +2732,10 @@ static int ext4_writepage(struct page *page, if (walk_page_buffers(NULL, page_bufs, 0, len, NULL, ext4_bh_delay_or_unwritten)) { /* - * We don't want to do block allocation So redirty the - * page and return We may reach here when we do a - * journal commit via - * journal_submit_inode_data_buffers. If we don't - * have mapping block we just ignore them. We can also - * reach here via shrink_page_list + * We don't want to do block allocation, so redirty + * the page and return. We may reach here when we do + * a journal commit via journal_submit_inode_data_buffers. + * We can also reach here via shrink_page_list */ goto redirty_page; } |