From patchwork Fri Apr 20 22:08:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksei Besogonov X-Patchwork-Id: 10353773 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DCD9E602B7 for ; Fri, 20 Apr 2018 22:09:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6949283E8 for ; Fri, 20 Apr 2018 22:09:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB7A9288C5; Fri, 20 Apr 2018 22:09:26 +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.0 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 65822283E8 for ; Fri, 20 Apr 2018 22:09:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752887AbeDTWJT (ORCPT ); Fri, 20 Apr 2018 18:09:19 -0400 Received: from smtp-fw-6001.amazon.com ([52.95.48.154]:8919 "EHLO smtp-fw-6001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752792AbeDTWJR (ORCPT ); Fri, 20 Apr 2018 18:09:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1524262156; x=1555798156; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=L3jrCAL0yOOQ2qGBfFpBzVu9nwdgElokDIl1zIGDPcU=; b=qA36QJ8Sh/zYg/ASk5aVeBFXD99bA5jMfOCkHNwdwftgksHaa18yanSv 1KbYqLD8SkGH2H/Q/X+uzwvJGEpiV877HrHFymZxQbnAdvXv2+KKrE/6p 5ot2sj6Yn8UQNaDlXpoR78FBS1vrMaAxOA/em0G4UNbdqxrhHAxca6wXA A=; X-IronPort-AV: E=Sophos;i="5.49,303,1520899200"; d="scan'208";a="340659379" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-303d0b0e.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 20 Apr 2018 22:09:14 +0000 Received: from EX13MTAUWC001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1e-303d0b0e.us-east-1.amazon.com (8.14.7/8.14.7) with ESMTP id w3KM9DXp081917 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL); Fri, 20 Apr 2018 22:09:15 GMT Received: from EX13D12UWC002.ant.amazon.com (10.43.162.253) by EX13MTAUWC001.ant.amazon.com (10.43.162.135) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Fri, 20 Apr 2018 22:09:15 +0000 Received: from EX13MTAUWB001.ant.amazon.com (10.43.161.207) by EX13D12UWC002.ant.amazon.com (10.43.162.253) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Fri, 20 Apr 2018 22:09:15 +0000 Received: from dev-dsk-cyberax-2c4-037e2d74.us-west-2.amazon.com (10.184.178.228) by mail-relay.amazon.com (10.43.161.249) with Microsoft SMTP Server id 15.0.1236.3 via Frontend Transport; Fri, 20 Apr 2018 22:09:14 +0000 Received: by dev-dsk-cyberax-2c4-037e2d74.us-west-2.amazon.com (Postfix, from userid 3193228) id 2DBD1A03F8; Fri, 20 Apr 2018 22:09:15 +0000 (UTC) From: Aleksei Besogonov To: , CC: Aleksei Besogonov Subject: [PATCH 2/2] xfs: add support for iomap-based swapfile activation Date: Fri, 20 Apr 2018 22:08:15 +0000 Message-ID: <20180420220815.44160-3-cyberax@amazon.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180420220815.44160-1-cyberax@amazon.com> References: <20180420220815.44160-1-cyberax@amazon.com> MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use iomap-based swapfile activation instead of the default generic_swapfile_activate bmap-based infrastructure. --- fs/xfs/xfs_aops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 31f1f10eecd1..878ff3872883 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -1491,6 +1491,12 @@ xfs_vm_set_page_dirty( return newly_dirty; } +static int xfs_swap_activate(struct swap_info_struct *sis, struct file *file, + sector_t *span) +{ + return iomap_swap_activate(sis, file, span, &xfs_iomap_ops); +} + const struct address_space_operations xfs_address_space_operations = { .readpage = xfs_vm_readpage, .readpages = xfs_vm_readpages, @@ -1504,4 +1510,5 @@ const struct address_space_operations xfs_address_space_operations = { .migratepage = buffer_migrate_page, .is_partially_uptodate = block_is_partially_uptodate, .error_remove_page = generic_error_remove_page, + .swap_activate = xfs_swap_activate, };