diff options
author | Darrick J. Wong <djwong@us.ibm.com> | 2011-05-18 13:53:20 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2011-05-18 13:53:20 -0400 |
commit | 7cb1a5351da8ac499d965a78e94c79ad27891f43 (patch) | |
tree | b78e2ff5d432f14e2840e8911654789b656b26db /fs/ext4 | |
parent | ed3ce80a52c4658f48ef8fc825bdedf8b3fcaa89 (diff) |
ext4: clean up some wait_on_page_writeback calls
wait_on_page_writeback already checks the writeback bit, so callers of it
needn't do that test.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/inode.c | 4 | ||||
-rw-r--r-- | fs/ext4/move_extent.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 3424e82392ad..f6caaac83731 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -2796,9 +2796,7 @@ static int write_cache_pages_da(struct address_space *mapping, | |||
2796 | continue; | 2796 | continue; |
2797 | } | 2797 | } |
2798 | 2798 | ||
2799 | if (PageWriteback(page)) | 2799 | wait_on_page_writeback(page); |
2800 | wait_on_page_writeback(page); | ||
2801 | |||
2802 | BUG_ON(PageWriteback(page)); | 2800 | BUG_ON(PageWriteback(page)); |
2803 | 2801 | ||
2804 | if (mpd->next_page != page->index) | 2802 | if (mpd->next_page != page->index) |
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index b9f3e7862f13..2b8304bf3c50 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c | |||
@@ -876,8 +876,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, | |||
876 | * It needs to call wait_on_page_writeback() to wait for the | 876 | * It needs to call wait_on_page_writeback() to wait for the |
877 | * writeback of the page. | 877 | * writeback of the page. |
878 | */ | 878 | */ |
879 | if (PageWriteback(page)) | 879 | wait_on_page_writeback(page); |
880 | wait_on_page_writeback(page); | ||
881 | 880 | ||
882 | /* Release old bh and drop refs */ | 881 | /* Release old bh and drop refs */ |
883 | try_to_release_page(page, 0); | 882 | try_to_release_page(page, 0); |