Commit 671f837a04cbcaaa10e8404989cf08ca3fdf1c80
Exists in
master
and in
7 other branches
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()
Showing 1 changed file Side-by-side Diff
fs/ext4/inode.c
| ... | ... | @@ -2718,7 +2718,7 @@ |
| 2718 | 2718 | * try to create them using __block_write_begin. If this |
| 2719 | 2719 | * fails, redirty the page and move on. |
| 2720 | 2720 | */ |
| 2721 | - if (!page_buffers(page)) { | |
| 2721 | + if (!page_has_buffers(page)) { | |
| 2722 | 2722 | if (__block_write_begin(page, 0, len, |
| 2723 | 2723 | noalloc_get_block_write)) { |
| 2724 | 2724 | redirty_page: |
| ... | ... | @@ -2732,12 +2732,10 @@ |
| 2732 | 2732 | if (walk_page_buffers(NULL, page_bufs, 0, len, NULL, |
| 2733 | 2733 | ext4_bh_delay_or_unwritten)) { |
| 2734 | 2734 | /* |
| 2735 | - * We don't want to do block allocation So redirty the | |
| 2736 | - * page and return We may reach here when we do a | |
| 2737 | - * journal commit via | |
| 2738 | - * journal_submit_inode_data_buffers. If we don't | |
| 2739 | - * have mapping block we just ignore them. We can also | |
| 2740 | - * reach here via shrink_page_list | |
| 2735 | + * We don't want to do block allocation, so redirty | |
| 2736 | + * the page and return. We may reach here when we do | |
| 2737 | + * a journal commit via journal_submit_inode_data_buffers. | |
| 2738 | + * We can also reach here via shrink_page_list | |
| 2741 | 2739 | */ |
| 2742 | 2740 | goto redirty_page; |
| 2743 | 2741 | } |