From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6F62C433E0 for ; Tue, 2 Jun 2020 04:47:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7A392206C3 for ; Tue, 2 Jun 2020 04:47:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="qi9bb2jp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A392206C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5B25280025; Tue, 2 Jun 2020 00:47:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 561CA8000F; Tue, 2 Jun 2020 00:47:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 404ED80025; Tue, 2 Jun 2020 00:47:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0042.hostedemail.com [216.40.44.42]) by kanga.kvack.org (Postfix) with ESMTP id 224CF8000F for ; Tue, 2 Jun 2020 00:47:56 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E709B1277 for ; Tue, 2 Jun 2020 04:47:55 +0000 (UTC) X-FDA: 76883039310.22.doll28_281b6066ad604 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id CEA6B18038E67 for ; Tue, 2 Jun 2020 04:47:55 +0000 (UTC) X-HE-Tag: doll28_281b6066ad604 X-Filterd-Recvd-Size: 3408 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Jun 2020 04:47:55 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 88F8B207D5; Tue, 2 Jun 2020 04:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591073274; bh=A9O8iFMjVM0xZfCGJMFaNxp6Qf+1a74pMNv8GncbEfI=; h=Date:From:To:Subject:In-Reply-To:From; b=qi9bb2jpjq/08lIpBV/igIYOAmMdKsmaybVZ6QzFRzoutJgr4g536zzWmOjC8Gk1d 1Xdm4uS6TaU6/2Ejs5iiV9PGZbVjcWaVinu7XWHzqFv8RO2Spr5qEUFBfa4SymSCf0 E/yBSWkwyvvajm2ot2/gahR+SWpIuyx9hh464LYA= Date: Mon, 01 Jun 2020 21:47:54 -0700 From: Andrew Morton To: akpm@linux-foundation.org, darrick.wong@oracle.com, david@fromorbit.com, guoqing.jiang@cloud.ionos.com, hch@infradead.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 044/128] iomap: use attach/detach_page_private Message-ID: <20200602044754.UTp724lWN%akpm@linux-foundation.org> In-Reply-To: <20200601214457.919c35648e96a2b46b573fe1@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: CEA6B18038E67 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: From: Guoqing Jiang Subject: iomap: use attach/detach_page_private Since the new pair function is introduced, we can call them to clean the code in iomap. Link: http://lkml.kernel.org/r/20200517214718.468-7-guoqing.jiang@cloud.ionos.com Signed-off-by: Guoqing Jiang Reviewed-by: Andrew Morton Cc: Christoph Hellwig Cc: "Darrick J. Wong" Cc: Dave Chinner Signed-off-by: Andrew Morton --- fs/iomap/buffered-io.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) --- a/fs/iomap/buffered-io.c~iomap-use-attach-detach_page_private +++ a/fs/iomap/buffered-io.c @@ -59,24 +59,19 @@ iomap_page_create(struct inode *inode, s * migrate_page_move_mapping() assumes that pages with private data have * their count elevated by 1. */ - get_page(page); - set_page_private(page, (unsigned long)iop); - SetPagePrivate(page); + attach_page_private(page, iop); return iop; } static void iomap_page_release(struct page *page) { - struct iomap_page *iop = to_iomap_page(page); + struct iomap_page *iop = detach_page_private(page); if (!iop) return; WARN_ON_ONCE(atomic_read(&iop->read_count)); WARN_ON_ONCE(atomic_read(&iop->write_count)); - ClearPagePrivate(page); - set_page_private(page, 0); - put_page(page); kfree(iop); } @@ -526,14 +521,8 @@ iomap_migrate_page(struct address_space if (ret != MIGRATEPAGE_SUCCESS) return ret; - if (page_has_private(page)) { - ClearPagePrivate(page); - get_page(newpage); - set_page_private(newpage, page_private(page)); - set_page_private(page, 0); - put_page(page); - SetPagePrivate(newpage); - } + if (page_has_private(page)) + attach_page_private(newpage, detach_page_private(page)); if (mode != MIGRATE_SYNC_NO_COPY) migrate_page_copy(newpage, page); _