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 7C587C433DF for ; Tue, 2 Jun 2020 04:48:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 36EA520772 for ; Tue, 2 Jun 2020 04:48:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="aUCrWy+j" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36EA520772 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 4EE36280013; Tue, 2 Jun 2020 00:48:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C6FF280012; Tue, 2 Jun 2020 00:48:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DAE1280013; Tue, 2 Jun 2020 00:48:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0048.hostedemail.com [216.40.44.48]) by kanga.kvack.org (Postfix) with ESMTP id 24495280012 for ; Tue, 2 Jun 2020 00:48:02 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id EC7888248D7C for ; Tue, 2 Jun 2020 04:48:01 +0000 (UTC) X-FDA: 76883039562.07.test10_28f85d5f62a00 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id CB05F1803F9AB for ; Tue, 2 Jun 2020 04:48:01 +0000 (UTC) X-HE-Tag: test10_28f85d5f62a00 X-Filterd-Recvd-Size: 4224 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Jun 2020 04:48:01 +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 7E70D206C3; Tue, 2 Jun 2020 04:48:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591073280; bh=A0HA7hMQ6mln4OhI+Nd6LTGolsjT38jX02xGaD8sbSY=; h=Date:From:To:Subject:In-Reply-To:From; b=aUCrWy+jzav1r/e4Pq+X0oQTqPpl8p6/3JmS/dC21VDg+MTw2BxuFzJWGJo6EGwSG TUTn6ovR/2m3NcxsjVq8hIzQLyxgqM1OOAns1X8Ae31XpAWtfutrkEroYl+aOvj/3j R5sydQTJlP/FOx+OXrYjto+o0lymp3qdpKiT+nxY= Date: Mon, 01 Jun 2020 21:48:00 -0700 From: Andrew Morton To: akpm@linux-foundation.org, guoqing.jiang@cloud.ionos.com, hubcap@omnibond.com, linux-mm@kvack.org, martin@omnibond.com, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 046/128] orangefs: use attach/detach_page_private Message-ID: <20200602044800.u3BDDCRmp%akpm@linux-foundation.org> In-Reply-To: <20200601214457.919c35648e96a2b46b573fe1@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: CB05F1803F9AB 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: orangefs: use attach/detach_page_private Since the new pair function is introduced, we can call them to clean the code in orangefs. Link: http://lkml.kernel.org/r/20200517214718.468-9-guoqing.jiang@cloud.ionos.com Signed-off-by: Guoqing Jiang Tested-by: Mike Marshall Reviewed-by: Andrew Morton Cc: Martin Brandenburg Signed-off-by: Andrew Morton --- fs/orangefs/inode.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) --- a/fs/orangefs/inode.c~orangefs-use-attach-detach_page_private +++ a/fs/orangefs/inode.c @@ -62,12 +62,7 @@ static int orangefs_writepage_locked(str } else { ret = 0; } - if (wr) { - kfree(wr); - set_page_private(page, 0); - ClearPagePrivate(page); - put_page(page); - } + kfree(detach_page_private(page)); return ret; } @@ -409,9 +404,7 @@ static int orangefs_write_begin(struct f wr->len = len; wr->uid = current_fsuid(); wr->gid = current_fsgid(); - SetPagePrivate(page); - set_page_private(page, (unsigned long)wr); - get_page(page); + attach_page_private(page, wr); okay: return 0; } @@ -459,18 +452,12 @@ static void orangefs_invalidatepage(stru wr = (struct orangefs_write_range *)page_private(page); if (offset == 0 && length == PAGE_SIZE) { - kfree((struct orangefs_write_range *)page_private(page)); - set_page_private(page, 0); - ClearPagePrivate(page); - put_page(page); + kfree(detach_page_private(page)); return; /* write range entirely within invalidate range (or equal) */ } else if (page_offset(page) + offset <= wr->pos && wr->pos + wr->len <= page_offset(page) + offset + length) { - kfree((struct orangefs_write_range *)page_private(page)); - set_page_private(page, 0); - ClearPagePrivate(page); - put_page(page); + kfree(detach_page_private(page)); /* XXX is this right? only caller in fs */ cancel_dirty_page(page); return; @@ -535,12 +522,7 @@ static int orangefs_releasepage(struct p static void orangefs_freepage(struct page *page) { - if (PagePrivate(page)) { - kfree((struct orangefs_write_range *)page_private(page)); - set_page_private(page, 0); - ClearPagePrivate(page); - put_page(page); - } + kfree(detach_page_private(page)); } static int orangefs_launder_page(struct page *page) @@ -740,9 +722,7 @@ vm_fault_t orangefs_page_mkwrite(struct wr->len = PAGE_SIZE; wr->uid = current_fsuid(); wr->gid = current_fsgid(); - SetPagePrivate(page); - set_page_private(page, (unsigned long)wr); - get_page(page); + attach_page_private(page, wr); okay: file_update_time(vmf->vma->vm_file); _