Message ID | 20200921080734.452759-11-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=kxYy=C6=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D7D2139F for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 21 Sep 2020 08:08:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3352220874 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 21 Sep 2020 08:08:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="rTzSzbsc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3352220874 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5851490003E; Mon, 21 Sep 2020 04:08:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 50C7990003D; Mon, 21 Sep 2020 04:08:02 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 317D690003E; Mon, 21 Sep 2020 04:08:02 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0167.hostedemail.com [216.40.44.167]) by kanga.kvack.org (Postfix) with ESMTP id 1068090003D for <linux-mm@kvack.org>; Mon, 21 Sep 2020 04:08:02 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id CB7B0180AD801 for <linux-mm@kvack.org>; Mon, 21 Sep 2020 08:08:01 +0000 (UTC) X-FDA: 77286340362.24.hour30_220885527143 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id A6F711A4A0 for <linux-mm@kvack.org>; Mon, 21 Sep 2020 08:08:01 +0000 (UTC) X-Spam-Summary: 1,0,0,90af7a81d087c2c2,d41d8cd98f00b204,batv+776a1a22abff015854b2+6238+infradead.org+hch@casper.srs.infradead.org,,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2196:2199:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3865:3867:3870:3871:3872:4385:5007:6261:6653:6742:8660:10004:11026:11658:11914:12043:12160:12297:12438:12517:12519:12555:12895:13069:13148:13161:13229:13230:13311:13357:13894:14096:14181:14384:14394:14721:14877:21080:21451:21627:21939:30054:30090,0,RBL:90.155.50.34:@casper.srs.infradead.org:.lbl8.mailshell.net-62.8.15.100 64.201.201.201;04yr1x9udi14jhwgncf9zh1py6i9xypbzj8be841j1b9wsp6j75sg7ymw1y57xx.1fqe7hzupewhr58hiqx73sr6g4bwpzs4qmzjmeicuhwukagxqp68m13ffmwxsz9.n-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: hour30_220885527143 X-Filterd-Recvd-Size: 3383 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf42.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Mon, 21 Sep 2020 08:08:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=I7MiMBMaLkYFUGes/ZWFe9+6oC03kpbTj/tDtF5mSAI=; b=rTzSzbsce3QgyMY8zv6MyEkHGY tbu55NiUpRPj7zKuLcSHaDR272lrt2BoJNqPBwqJ/YPIU7ISABrYkM/UwmAVOJtnJOzR4jO94X+Rr oDd6Q6oZsQz8+QzGD/KySwZd8yNarsrpwX7WXnHSzs/6DeyG+S/FfkOZex0czj4dp72lWTyKGq4m7 KVELv/mCJOyjfX5baxc0ps7djKVZoJ4qzFG9v3b34iaCGHz2Vcs0iQ8qSkTSHbIA7lSyCtfivoACK U0DFDLgQOD2YDza3HGsuEzAANqxYywc/6eztDNgLEwqpAOimEa3Wum76r7ogMOTUB6Whyy+S30Yli Rfp7uhug==; Received: from p4fdb0c34.dip0.t-ipconnect.de ([79.219.12.52] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKGrT-0006Y1-Dl; Mon, 21 Sep 2020 08:07:47 +0000 From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Song Liu <song@kernel.org>, Hans de Goede <hdegoede@redhat.com>, Coly Li <colyli@suse.de>, Richard Weinberger <richard@nod.at>, Minchan Kim <minchan@kernel.org>, Johannes Thumshirn <Johannes.Thumshirn@wdc.com>, Justin Sanders <justin@coraid.com>, linux-mtd@lists.infradead.org, dm-devel@redhat.com, linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, Jan Kara <jack@suse.cz>, Johannes Thumshirn <johannes.thumshirn@wdc.com> Subject: [PATCH 10/13] mm: use SWP_SYNCHRONOUS_IO more intelligently Date: Mon, 21 Sep 2020 10:07:31 +0200 Message-Id: <20200921080734.452759-11-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921080734.452759-1-hch@lst.de> References: <20200921080734.452759-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> by casper.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
[01/13] fs: remove the unused SB_I_MULTIROOT flag
|
expand
|
diff --git a/mm/page_io.c b/mm/page_io.c index e485a6e8a6cddb..b199b87e0aa92b 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -403,15 +403,17 @@ int swap_readpage(struct page *page, bool synchronous) goto out; } - ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); - if (!ret) { - if (trylock_page(page)) { - swap_slot_free_notify(page); - unlock_page(page); - } + if (sis->flags & SWP_SYNCHRONOUS_IO) { + ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); + if (!ret) { + if (trylock_page(page)) { + swap_slot_free_notify(page); + unlock_page(page); + } - count_vm_event(PSWPIN); - goto out; + count_vm_event(PSWPIN); + goto out; + } } ret = 0;