diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
| commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
| tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /fs/nilfs2/page.c | |
| parent | 0a93a47f042c459f0f46942c3a920e3c81878031 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge commit 'v2.6.30' into for-2.6.31
Diffstat (limited to 'fs/nilfs2/page.c')
| -rw-r--r-- | fs/nilfs2/page.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 1bfbba9c0e9..a2692bbc7b5 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c | |||
| @@ -128,7 +128,8 @@ void nilfs_forget_buffer(struct buffer_head *bh) | |||
| 128 | 128 | ||
| 129 | lock_buffer(bh); | 129 | lock_buffer(bh); |
| 130 | clear_buffer_nilfs_volatile(bh); | 130 | clear_buffer_nilfs_volatile(bh); |
| 131 | if (test_clear_buffer_dirty(bh) && nilfs_page_buffers_clean(page)) | 131 | clear_buffer_dirty(bh); |
| 132 | if (nilfs_page_buffers_clean(page)) | ||
| 132 | __nilfs_clear_page_dirty(page); | 133 | __nilfs_clear_page_dirty(page); |
| 133 | 134 | ||
| 134 | clear_buffer_uptodate(bh); | 135 | clear_buffer_uptodate(bh); |