From patchwork Thu Jan 17 07:48:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 10767657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5006139A for ; Thu, 17 Jan 2019 07:49:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D810C2E159 for ; Thu, 17 Jan 2019 07:49:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCBAC2E186; Thu, 17 Jan 2019 07:49:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EBD62E159 for ; Thu, 17 Jan 2019 07:49:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727021AbfAQHtK (ORCPT ); Thu, 17 Jan 2019 02:49:10 -0500 Received: from mx2.suse.de ([195.135.220.15]:54846 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725954AbfAQHtK (ORCPT ); Thu, 17 Jan 2019 02:49:10 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2ED39AE83 for ; Thu, 17 Jan 2019 07:49:08 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 3/5] btrfs: extent_io: Kill the BUG_ON() in flush_write_bio() Date: Thu, 17 Jan 2019 15:48:53 +0800 Message-Id: <20190117074855.24818-4-wqu@suse.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190117074855.24818-1-wqu@suse.com> References: <20190117074855.24818-1-wqu@suse.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This BUG_ON() is really just a crappy way to workaround the _must_check attribute of submit_one_bio(). Now kill the BUG_ON() and allow flush_write_bio() to return error number. Also add _must_check attribute to flush_write_bio(), and modify all callers to handle the possible error returned. Signed-off-by: Qu Wenruo --- fs/btrfs/extent_io.c | 64 +++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 8a2335713a2d..a773bc46badc 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -169,15 +169,15 @@ static int __must_check submit_one_bio(struct bio *bio, int mirror_num, return blk_status_to_errno(ret); } -static void flush_write_bio(struct extent_page_data *epd) +static int __must_check flush_write_bio(struct extent_page_data *epd) { - if (epd->bio) { - int ret; + int ret = 0; + if (epd->bio) { ret = submit_one_bio(epd->bio, 0, 0); - BUG_ON(ret < 0); /* -ENOMEM */ epd->bio = NULL; } + return ret; } int __init extent_io_init(void) @@ -3509,8 +3509,10 @@ lock_extent_buffer_for_io(struct extent_buffer *eb, int ret = 0; if (!btrfs_try_tree_write_lock(eb)) { + ret = flush_write_bio(epd); + if (ret < 0) + return ret; flush = 1; - flush_write_bio(epd); btrfs_tree_lock(eb); } @@ -3519,7 +3521,9 @@ lock_extent_buffer_for_io(struct extent_buffer *eb, if (!epd->sync_io) return 0; if (!flush) { - flush_write_bio(epd); + ret = flush_write_bio(epd); + if (ret < 0) + return ret; flush = 1; } while (1) { @@ -3560,7 +3564,9 @@ lock_extent_buffer_for_io(struct extent_buffer *eb, if (!trylock_page(p)) { if (!flush) { - flush_write_bio(epd); + ret = flush_write_bio(epd); + if (ret < 0) + return ret; flush = 1; } lock_page(p); @@ -3751,6 +3757,7 @@ int btree_write_cache_pages(struct address_space *mapping, .sync_io = wbc->sync_mode == WB_SYNC_ALL, }; int ret = 0; + int flush_ret; int done = 0; int nr_to_write_done = 0; struct pagevec pvec; @@ -3818,6 +3825,11 @@ int btree_write_cache_pages(struct address_space *mapping, prev_eb = eb; ret = lock_extent_buffer_for_io(eb, fs_info, &epd); + if (ret < 0) { + free_extent_buffer(eb); + done = 1; + break; + } if (!ret) { free_extent_buffer(eb); continue; @@ -3850,8 +3862,10 @@ int btree_write_cache_pages(struct address_space *mapping, index = 0; goto retry; } - flush_write_bio(&epd); - return ret; + flush_ret = flush_write_bio(&epd); + if (ret) + return ret; + return flush_ret; } /** @@ -3947,7 +3961,9 @@ static int extent_write_cache_pages(struct address_space *mapping, * tmpfs file mapping */ if (!trylock_page(page)) { - flush_write_bio(epd); + ret = flush_write_bio(epd); + if (ret < 0) + break; lock_page(page); } @@ -3957,8 +3973,11 @@ static int extent_write_cache_pages(struct address_space *mapping, } if (wbc->sync_mode != WB_SYNC_NONE) { - if (PageWriteback(page)) - flush_write_bio(epd); + if (PageWriteback(page)) { + ret = flush_write_bio(epd); + if (ret < 0) + break; + } wait_on_page_writeback(page); } @@ -4019,6 +4038,7 @@ static int extent_write_cache_pages(struct address_space *mapping, int extent_write_full_page(struct page *page, struct writeback_control *wbc) { int ret; + int flush_ret; struct extent_page_data epd = { .bio = NULL, .tree = &BTRFS_I(page->mapping->host)->io_tree, @@ -4028,14 +4048,17 @@ int extent_write_full_page(struct page *page, struct writeback_control *wbc) ret = __extent_writepage(page, wbc, &epd); - flush_write_bio(&epd); - return ret; + flush_ret = flush_write_bio(&epd); + if (ret) + return ret; + return flush_ret; } int extent_write_locked_range(struct inode *inode, u64 start, u64 end, int mode) { int ret = 0; + int flush_ret; struct address_space *mapping = inode->i_mapping; struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree; struct page *page; @@ -4068,14 +4091,17 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end, start += PAGE_SIZE; } - flush_write_bio(&epd); - return ret; + flush_ret = flush_write_bio(&epd); + if (ret) + return ret; + return flush_ret; } int extent_writepages(struct address_space *mapping, struct writeback_control *wbc) { int ret = 0; + int flush_ret; struct extent_page_data epd = { .bio = NULL, .tree = &BTRFS_I(mapping->host)->io_tree, @@ -4084,8 +4110,10 @@ int extent_writepages(struct address_space *mapping, }; ret = extent_write_cache_pages(mapping, wbc, &epd); - flush_write_bio(&epd); - return ret; + flush_ret = flush_write_bio(&epd); + if (ret) + return ret; + return flush_ret; } int extent_readpages(struct address_space *mapping, struct list_head *pages,