From patchwork Sat Apr 18 22:51:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11497043 Return-Path: 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 A0A23174A for ; Sat, 18 Apr 2020 22:51:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8839E21D7E for ; Sat, 18 Apr 2020 22:51:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="O73MuiYG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728343AbgDRWvb (ORCPT ); Sat, 18 Apr 2020 18:51:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728302AbgDRWvb (ORCPT ); Sat, 18 Apr 2020 18:51:31 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15C36C061A0F for ; Sat, 18 Apr 2020 15:51:31 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id l3so1428899edq.13 for ; Sat, 18 Apr 2020 15:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w0luk3914pNV5Z2D7FYXeVI+e9BK/K/Gjo+01ZBjbXw=; b=O73MuiYGbH+46Zl86nDDirPeDGYbeg/MIxxMvueibpPnSdgLygy21X46HZ+Xf+goJq Qiucm8uTgdm1kKgVo4DDDd7YY8SijdSg6Ax/MdtPlPdqE8e2yoMqCt7rMn8ZVpK7mnyQ IYNz76+sHMe+LQFguG/J9+Uqmkh2GgQIUjH6anVaqN8C50hJ5CunSmFkVu4BvJ8uDm1y erUzcARK+PvWzcnMS8dorPNIJB4WUWCgUGJN6eP+RvCutj5InHUcSXU9Zq8GvsOSSH1R w1fsukDzIl11L0Fr6Q/yUJPl4/Vty1soCKCJErN96BQ1VgMrWPtiNNyssaOOomsXQ020 FGwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w0luk3914pNV5Z2D7FYXeVI+e9BK/K/Gjo+01ZBjbXw=; b=FqgXGxGRzDzkPzIAV9JEsVeQloQLuVoM5m1NVYl1+xdeidGTTo0BIpo5CI+x5XHjEz QxYijv/egUWGPy1mIAPx9TGPt13SHPfYesi4PqeAu0odIaxcsZx0hyYqAaGNgijxpETd URfX1ZjWn6tXVR0p4PUBSh1+PPf6k9fjanMD7O9Rn74EwFZwmeC/tuMFTVfwjMez0oMO OVyv2rcXLpVKDne3O5sIm0mjHGnJ2IGOC6KKvzCU1T1J8j3tSc94ndrI68tkSY//8DYr xrKGJPY8myadMq+YvoKfFP+pmyow6DCvh4XfS6es8AomUvJ45NiAN2W6M0h9wvb1WyYf THAA== X-Gm-Message-State: AGi0PubyW3zh+AORjRAJnRY2cO6/qSCPy1EaCcaLIJiz4OyfOqfcjVq8 CNZrPFHORzh5yJPCGLH4sOoSMKLckApxlA== X-Google-Smtp-Source: APiQypJjvw0Gub6G6MI63rFhPdm4CjFtb+5QNO1gPvUdj5qsoRBqC0pSuXpDMCdrmXWe3sl4cjp9BA== X-Received: by 2002:aa7:cd6a:: with SMTP id ca10mr8572866edb.332.1587250289576; Sat, 18 Apr 2020 15:51:29 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:6c58:b8bc:cdc6:2e2d]) by smtp.gmail.com with ESMTPSA id g21sm2616767ejm.79.2020.04.18.15.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:51:28 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org Cc: Guoqing Jiang , Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org Subject: [PATCH 2/5] btrfs: call __clear_page_buffers to simplify code Date: Sun, 19 Apr 2020 00:51:20 +0200 Message-Id: <20200418225123.31850-3-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200418225123.31850-1-guoqing.jiang@cloud.ionos.com> References: <20200418225123.31850-1-guoqing.jiang@cloud.ionos.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Some places can be replaced with __clear_page_buffers after the function is exported. Cc: Chris Mason Cc: Josef Bacik Cc: David Sterba Cc: linux-btrfs@vger.kernel.org Signed-off-by: Guoqing Jiang --- fs/btrfs/disk-io.c | 5 ++--- fs/btrfs/extent_io.c | 6 ++---- fs/btrfs/inode.c | 14 ++++---------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index a6cb5cbbdb9f..0f1e5690e8a4 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include "ctree.h" @@ -980,9 +981,7 @@ static void btree_invalidatepage(struct page *page, unsigned int offset, btrfs_warn(BTRFS_I(page->mapping->host)->root->fs_info, "page private not zero on page %llu", (unsigned long long)page_offset(page)); - ClearPagePrivate(page); - set_page_private(page, 0); - put_page(page); + __clear_page_buffers(page); } } diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 39e45b8a5031..317a1cdc7d3e 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "extent_io.h" #include "extent-io-tree.h" #include "extent_map.h" @@ -4929,10 +4930,7 @@ static void btrfs_release_extent_buffer_pages(struct extent_buffer *eb) * We need to make sure we haven't be attached * to a new eb. */ - ClearPagePrivate(page); - set_page_private(page, 0); - /* One for the page private */ - put_page(page); + __clear_page_buffers(page); } if (mapped) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 320d1062068d..95886202c74f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8303,11 +8303,8 @@ btrfs_readpages(struct file *file, struct address_space *mapping, static int __btrfs_releasepage(struct page *page, gfp_t gfp_flags) { int ret = try_release_extent_mapping(page, gfp_flags); - if (ret == 1) { - ClearPagePrivate(page); - set_page_private(page, 0); - put_page(page); - } + if (ret == 1) + __clear_page_buffers(page); return ret; } @@ -8458,11 +8455,8 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, } ClearPageChecked(page); - if (PagePrivate(page)) { - ClearPagePrivate(page); - set_page_private(page, 0); - put_page(page); - } + if (PagePrivate(page)) + __clear_page_buffers(page); } /*