diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-09-30 22:57:41 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-14 08:07:12 -0800 |
| commit | 2489f42e40972d65e50a0b842297f90ce02e6cb0 (patch) | |
| tree | bfd871751718ab75aa69cfb1b6f575bc3effa9be | |
| parent | 28c72b7fbc403ec439b0108e6559c9c67a3afe8d (diff) | |
| download | lwn-2489f42e40972d65e50a0b842297f90ce02e6cb0.tar.gz lwn-2489f42e40972d65e50a0b842297f90ce02e6cb0.zip | |
ext4: fix a BUG_ON crash by checking that page has buffers attached to it
(cherry picked from commit 1f94533d9cd75f6d2826018d54a971b9cc085992)
In ext4_num_dirty_pages() we were calling page_buffers() before
checking to see if the page actually had pages attached to it; this
would cause a BUG check crash in the inline function page_buffers().
Thanks to Markus Trippelsdorf for reporting this bug.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/ext4/inode.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 30b1f3bf818e..aac46d0000af 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1147,8 +1147,8 @@ static int check_block_validity(struct inode *inode, const char *msg, } /* - * Return the number of dirty pages in the given inode starting at - * page frame idx. + * Return the number of contiguous dirty pages in a given inode + * starting at page frame idx. */ static pgoff_t ext4_num_dirty_pages(struct inode *inode, pgoff_t idx, unsigned int max_pages) @@ -1182,15 +1182,15 @@ static pgoff_t ext4_num_dirty_pages(struct inode *inode, pgoff_t idx, unlock_page(page); break; } - head = page_buffers(page); - bh = head; - do { - if (!buffer_delay(bh) && - !buffer_unwritten(bh)) { - done = 1; - break; - } - } while ((bh = bh->b_this_page) != head); + if (page_has_buffers(page)) { + bh = head = page_buffers(page); + do { + if (!buffer_delay(bh) && + !buffer_unwritten(bh)) + done = 1; + bh = bh->b_this_page; + } while (!done && (bh != head)); + } unlock_page(page); if (done) break; |