On Sat, Feb 12, 2011 at 07:15:52PM -0500, Theodore Ts'o wrote:
> Eliminate duplicate code, unneeded variables, etc., to make it easier
> to understand the code. No behavioral changes were made in this patch.
>
> Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
> ---
> fs/ext4/inode.c | 115 +++++++++++++++++++++++--------------------------------
> 1 files changed, 48 insertions(+), 67 deletions(-)
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 627729f..e230f4f 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -2723,17 +2723,14 @@ static int write_cache_pages_da(struct address_space *mapping,
> struct mpage_da_data *mpd,
> pgoff_t *done_index)
> {
> - struct inode *inode = mpd->inode;
> - struct buffer_head *bh, *head;
> - sector_t logical;
> - int ret = 0;
> - int done = 0;
> - struct pagevec pvec;
> - unsigned nr_pages;
> - pgoff_t index;
> - pgoff_t end; /* Inclusive */
> - long nr_to_write = wbc->nr_to_write;
> - int tag;
> + struct buffer_head *bh, *head;
> + struct inode *inode = mpd->inode;
> + struct pagevec pvec;
> + unsigned int nr_pages;
> + sector_t logical;
> + pgoff_t index, end;
> + long nr_to_write = wbc->nr_to_write;
> + int i, tag, ret = 0;
>
> pagevec_init(&pvec, 0);
> index = wbc->range_start >> PAGE_CACHE_SHIFT;
> @@ -2745,13 +2742,11 @@ static int write_cache_pages_da(struct address_space *mapping,
> tag = PAGECACHE_TAG_DIRTY;
>
> *done_index = index;
> - while (!done && (index <= end)) {
> - int i;
> -
> + while (index <= end) {
> nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag,
> min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1);
> if (nr_pages == 0)
> - break;
> + return 0;
>
> for (i = 0; i < nr_pages; i++) {
> struct page *page = pvec.pages[i];
> @@ -2763,47 +2758,37 @@ static int write_cache_pages_da(struct address_space *mapping,
> * mapping. However, page->index will not change
> * because we have a reference on the page.
> */
> - if (page->index > end) {
> - done = 1;
> - break;
> - }
> + if (page->index > end)
> + goto out;
>
> *done_index = page->index + 1;
>
> lock_page(page);
>
> /*
> - * Page truncated or invalidated. We can freely skip it
> - * then, even for data integrity operations: the page
> - * has disappeared concurrently, so there could be no
> - * real expectation of this data interity operation
> - * even if there is now a new, dirty page at the same
> - * pagecache address.
> + * If the page is no longer dirty, or its
> + * mapping no longer corresponds to inode we
> + * are writing (which means it has been
> + * truncated or invalidated), or the page is
> + * already under writeback and we are not
> + * doing a data integrity writeback, skip the page
> */
> - if (unlikely(page->mapping != mapping)) {
> -continue_unlock:
> + if (!PageDirty(page) ||
> + (PageWriteback(page) &&
> + (wbc->sync_mode == WB_SYNC_NONE)) ||
> + unlikely(page->mapping != mapping)) {
> + continue_unlock:
Formatting is wrong here. Everything else looks fine. Thanks,
Josef
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
