From patchwork Sat Apr 18 22:51:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11497041 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 3ACA61668 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 22EEF21D7E 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="bAelyIOi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728342AbgDRWvb (ORCPT ); Sat, 18 Apr 2020 18:51:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726887AbgDRWvb (ORCPT ); Sat, 18 Apr 2020 18:51:31 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1717C061A0C for ; Sat, 18 Apr 2020 15:51:29 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id p6so4361455edu.10 for ; Sat, 18 Apr 2020 15:51:29 -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=cFu/s1WUWRTKfL++ymdKBNKB4z5V4nO3awV8fbzpHOU=; b=bAelyIOiycqdA3PHytQ5JNmxRIMokDZCfaqXWmLiSP5v93FMbAIm0wa9608080qvqd rLaIcXx9UIkgQ6WRkH/owbm7Id1Ae9CbwqmQQhUkI5YfW1hTWWJpSjdGwxTY6pxhUaGa X/m2YLLAd2wX0n7Z2FrFmGsPJ6qeqGH88wz9YfYHN721hH/FtHzZ2fXXkJ6+RgCZ1W/Q SunK8CV/RC7dWu8zH+78Edn8jvkeZdj2iEUztsu32TAoG1PJNFQN4GcwhmMlWtsRb9bV jFcmOTKm/+/BSwcyjPpr9A8cmqpNwt0dHrVCkVkEJPSfpR/vpPY0KdxLzaOPZe5GuJGw nUag== 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=cFu/s1WUWRTKfL++ymdKBNKB4z5V4nO3awV8fbzpHOU=; b=SZJnM0+rcjwS4ZNRX7QNW8JxY7Nd5XUqOyDwJLz9G2FSUjdsIP0pUE8zr7XXUuwPA6 EVvfy5D7QkXHjjEQcqqRhUzEXDdwjqW3cfHWxBHP/NnIUoBQ+ZGnuH5yhLfMqMIETWF7 kZHw8uh2Lb30dY9qOnd/7nS3HjG//kX+HrRYybTms94h6qeUeHDuVo3+qEzNEVatET91 ZmcCxme5XKDsUD7m2V7Yisp1tbWHtX0ZnxgtVI9kwGHWH7GkHra58FDGdr48WphA1XOf LxncHxTzzygQV2Guc5puOmYpClB1SHNw/pmxKiufIOpLPywIeMSPhZquV2OpMm948vur aELg== X-Gm-Message-State: AGi0PuaJRkh6sc9qjs2k8iDI11s/RX2xb/U92nb9iuQHIkTbLnL2kCsh w4g5DZr9EcM3joPY1uOR3PLGCJaUUDTLkQ== X-Google-Smtp-Source: APiQypLsLZrtVlzve3FEY5SXreoZYBhW88KG0qYYT5BpqW2oJ2LQ+9RIy+hUEyxe+l77uJ1OW7+F7A== X-Received: by 2002:aa7:d3cb:: with SMTP id o11mr8422616edr.194.1587250288517; Sat, 18 Apr 2020 15:51:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:51:27 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org Cc: Guoqing Jiang , Alexander Viro Subject: [PATCH 1/5] fs/buffer: export __clear_page_buffers Date: Sun, 19 Apr 2020 00:51:19 +0200 Message-Id: <20200418225123.31850-2-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 Export the function so others (such as md, btrfs and iomap) can reuse it. Cc: Alexander Viro Signed-off-by: Guoqing Jiang --- fs/buffer.c | 4 ++-- include/linux/buffer_head.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index f73276d746bb..05b7489d9aa3 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -123,13 +123,13 @@ void __wait_on_buffer(struct buffer_head * bh) } EXPORT_SYMBOL(__wait_on_buffer); -static void -__clear_page_buffers(struct page *page) +void __clear_page_buffers(struct page *page) { ClearPagePrivate(page); set_page_private(page, 0); put_page(page); } +EXPORT_SYMBOL(__clear_page_buffers); static void buffer_io_error(struct buffer_head *bh, char *msg) { diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index e0b020eaf32e..735b094d89e1 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -181,6 +181,7 @@ static inline void clean_bdev_bh_alias(struct buffer_head *bh) void mark_buffer_async_write(struct buffer_head *bh); void __wait_on_buffer(struct buffer_head *); +void __clear_page_buffers(struct page *page); wait_queue_head_t *bh_waitq_head(struct buffer_head *bh); struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block, unsigned size); 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); } /* From patchwork Sat Apr 18 22:51:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11497049 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 B61BA913 for ; Sat, 18 Apr 2020 22:51:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F03321D6C for ; Sat, 18 Apr 2020 22:51:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="BydKuw3C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728346AbgDRWvf (ORCPT ); Sat, 18 Apr 2020 18:51:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728350AbgDRWvd (ORCPT ); Sat, 18 Apr 2020 18:51:33 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 132D3C061A10 for ; Sat, 18 Apr 2020 15:51:32 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id s9so4671078eju.1 for ; Sat, 18 Apr 2020 15:51:31 -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=vI+qH6PQl8iOTuF91icuURnJsbkLpyoxA3JGpFFvgGY=; b=BydKuw3C1yL1Zrxj6fxlQJkXD633PCUQ9qVzyPGmiKRT14W89wfOFNSS+Hn26SuP+5 Vo8HJw8MYYtBGBAka0mqnlZlMMpd0ptQhbl7X6NKiKmz4XXv30cOi6hUfbAMo1UA7lWS aMU2m7g8WpHmjULDeYJfoOER9Zb+JUo/YdxUvVip7Ug9p+yE4waD/O7MAU+DT11IeVhf eqz4E0nWeK0hqywttveVAT7SDsG3iT3349J/4hDoFu+IhWgBCaLPqa6KndDTuxt9G1sG s72FVBDp83nZald1aA+FeIOXFjl43cVKu/bvFr+ZUIbsx5uGs5MIlycbgyxqgGR7wXjM J6HQ== 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=vI+qH6PQl8iOTuF91icuURnJsbkLpyoxA3JGpFFvgGY=; b=LiMG4LaTBExJTe5wmbZxGx45oxStRYrilnd+1OLi8d2xi/FcA0wQLHZxCbgN+8ALa0 tg8/lywm6J72nfyiCm7AsQZ3oVjU2Ml8ejvkXR+7QwlG+lal7UZs4nVZotj5OtnHUmEd 8oUaocF9WvR8/ZcdnWRXbocQ2gbIsQaQF5gaqf9xQ6o0e7TfFCbgL32a7ZHOqEAIj5A4 sw54+DXZeoD9DVrA3d9ICacKrVkZhnIPxwWDArO4NoZTXyc5E7dCeHLMHLCPQixBkH+z zs4SBUymSWXOKqqv5p94rFfTeL1hQ5G9iK/GIe/3vE0S1/a0rY7PED6WB6XXauJdM3G4 1X3Q== X-Gm-Message-State: AGi0PuYWDBO+nBJVNnGh0aPBkErFHSJXvpt70WijKMIcBC6k94FCEwnW KZQP0GSisBzw/efSVKqZ+y0DCg8Utu9GfA== X-Google-Smtp-Source: APiQypKY3BdcqjF3Tf4l/0w0TOoBeBknIwydV9wTBcWqQDgCxj4Pnxn7JcavMI4hhcMA45D9jzledw== X-Received: by 2002:a17:907:72c9:: with SMTP id du9mr3995735ejc.146.1587250290578; Sat, 18 Apr 2020 15:51:30 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:51:29 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org Cc: Guoqing Jiang , Christoph Hellwig , "Darrick J . Wong" , linux-xfs@vger.kernel.org Subject: [PATCH 3/5] iomap: call __clear_page_buffers in iomap_page_release Date: Sun, 19 Apr 2020 00:51:21 +0200 Message-Id: <20200418225123.31850-4-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 After the helper is exported, we can call it to simplify code a little. Cc: Christoph Hellwig Cc: Darrick J. Wong Cc: linux-xfs@vger.kernel.org Signed-off-by: Guoqing Jiang --- fs/iomap/buffered-io.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 89e21961d1ad..b06568ad9a7a 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -74,9 +74,7 @@ iomap_page_release(struct page *page) 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); + __clear_page_buffers(page); kfree(iop); } From patchwork Sat Apr 18 22:51:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11497053 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 8710A174A for ; Sat, 18 Apr 2020 22:51:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CAF821D7E for ; Sat, 18 Apr 2020 22:51:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="KFN2BQBg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728370AbgDRWvg (ORCPT ); Sat, 18 Apr 2020 18:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728349AbgDRWvd (ORCPT ); Sat, 18 Apr 2020 18:51:33 -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 BC368C061A41 for ; Sat, 18 Apr 2020 15:51:32 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id j20so4381300edj.0 for ; Sat, 18 Apr 2020 15:51:32 -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=LJG/tvH74vPoZBWRmNdYjJBmTLQ93YDBV04Re8a/V+U=; b=KFN2BQBgovkjPW//Nj/G8X+du1tRzLXj3PCGFEzq/F5Zsi2k2lzaSPr7Eim84Z00wY o4Zc/B9YK556Iq9QhV8vk+JD5GbiG6musD/+6BRa8VHL62dCSI+QUoXisnlz9uIMXMHL yiWinSld4vUf9bOMhpCaheaghCuxM9BftbPgd0nAKIvsEAeug2B3rCDtofQvM3+nkGhF oSqB6MiYRP+75flGNSdr2NK6HCegAL+XJ75G/Fjv0QjR27pJNR+BcYg+UX/UXM10NTYj Zc+MD8TwBw0tfPOef1OUjuzMoceCf6+juHrK0ycAyga1RwV58qs7ET/d/p2X775r6S30 IXtA== 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=LJG/tvH74vPoZBWRmNdYjJBmTLQ93YDBV04Re8a/V+U=; b=KQzSQK60qdcEFjWzCMClSQawtYKiECM2yT03iCdBtHdWX7YqWkJU/+4FpIojXoYHDR 1nsXu3FdEjwvUnJSLAZX8GBuwTj1gMITpK4sIQGNrs5RDIUb2xOb+30tTCon90pMVGKA r+NeZJBIL+0NVtfUtPe6oUAM0MzT6KS3HL5LuXvkx/ylHMuG6bC7CgKkkwhbBBMvQLhW d0g9tOCqrMFcEZwc0XguAWFl0VvGHlGOOthz/sICN/+4x7lLXcpCKZYyr8Sfu/1pHVCx Jr1pyIOXeO3HOkVJhXX1Iz8f1SP3mPyajRwTpA/0Z7kR/dRd3AXceI/2sOzVhM8Uscuy jdzA== X-Gm-Message-State: AGi0PuYt9NgDq/SgWESOlkcD3AHOZRQIyKL0cENCF9vRU/G5n9XbZZzP Ijf9Z82Qdb0cstvEWFsl2+PLf0537ClN/g== X-Google-Smtp-Source: APiQypJovF9nvn1Yr9ZkK7hvEAqP4GrPPtpF1BNuB0WcmsdP6W/7lfIf/XIOf4WoWYBYdHzCtr5a9g== X-Received: by 2002:aa7:d056:: with SMTP id n22mr8533808edo.281.1587250291361; Sat, 18 Apr 2020 15:51:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:51:30 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org Cc: Guoqing Jiang , Mike Marshall , Martin Brandenburg , devel@lists.orangefs.org Subject: [RFC PATCH 4/5] orangefs: call __clear_page_buffers to simplify code Date: Sun, 19 Apr 2020 00:51:22 +0200 Message-Id: <20200418225123.31850-5-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 Since __clear_page_buffers is exported, we can call __clear_page_buffers to simplify code in the four places. Cc: Mike Marshall Cc: Martin Brandenburg Cc: devel@lists.orangefs.org Signed-off-by: Guoqing Jiang --- The order for set_page_private and ClearPagePrivate is swapped in __clear_page_buffers, not sure it is identical or not, so this is RFC. Thanks, Guoqing fs/orangefs/inode.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 12ae630fbed7..8e1591d8bf24 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -11,6 +11,7 @@ */ #include +#include #include "protocol.h" #include "orangefs-kernel.h" #include "orangefs-bufmap.h" @@ -64,9 +65,7 @@ static int orangefs_writepage_locked(struct page *page, } if (wr) { kfree(wr); - set_page_private(page, 0); - ClearPagePrivate(page); - put_page(page); + __clear_page_buffers(page); } return ret; } @@ -460,17 +459,13 @@ static void orangefs_invalidatepage(struct page *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); + __clear_page_buffers(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); + __clear_page_buffers(page); /* XXX is this right? only caller in fs */ cancel_dirty_page(page); return; @@ -537,9 +532,7 @@ 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); + __clear_page_buffers(page); } } From patchwork Sat Apr 18 22:51:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11497051 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 66A161668 for ; Sat, 18 Apr 2020 22:51:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F50521D91 for ; Sat, 18 Apr 2020 22:51:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="YIJwwQnM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728372AbgDRWvg (ORCPT ); Sat, 18 Apr 2020 18:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728362AbgDRWvf (ORCPT ); Sat, 18 Apr 2020 18:51:35 -0400 Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC0CBC0610D6 for ; Sat, 18 Apr 2020 15:51:33 -0700 (PDT) Received: by mail-ed1-x543.google.com with SMTP id g16so4391280eds.1 for ; Sat, 18 Apr 2020 15:51:33 -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=hL6p6zRwYRA8CkbRJsKJgrHbaaCXLqCx5oMrPjaFW4Q=; b=YIJwwQnMLeEO1MmhiXMMg2q4Jy+N/8huIrljqa3VGIl5RwQUL4vBgWq9lK2vWImONh jWSOhP8RMEvHfb+GZexYyHOPRiKSPLIJnRhINkYKgcrpkThi9io5dqEvw0HPvJJpRs4B HxArufN8+hphijbsEfJXX2AKrXXOvenOPFu1SGXxBJJhu02+SHsNDtORcnxJU3kivGq7 9IcsOz0Ra+Zmtj7CJ4JwJtIQG4Te4CS7DF4eM+fMaZku8D7MoRhlN4IfUNZktWmc4ZNS +RVBa3fNdE6MKNX4Bs12OkzqEAqVNXT5qO2HK9yDakaOnvAyJTLvXAqrq0fb1woTcN+K FJ8Q== 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=hL6p6zRwYRA8CkbRJsKJgrHbaaCXLqCx5oMrPjaFW4Q=; b=L/TEiYH5ostHvq3ynKmomWGDRm9HidN9KvoU0UJUSVY7v4Q3uf4ETC5CksZJSP+YRm Y7NWwMIne2hCHHKQ5qnOge1/QLp2Ghx3S6Jda9+f+usEl+8a5DTDSZTeRi/VnT1ia2qM mYU6Ofq+TPfcG1A6Ay0zULK+AVpVmpbp1AxWr1huJy8SDxMestzy/bBMQUkguDCf2XJ9 4NO4k9Jz/UtbNkydLs/VqpxZn/saEYCd1a4SKgbujr95O0je3QkMTnUGqIxF62E8zc1/ brcaqU4ridBLVtgJ9cTfTyHJnhGMhSeC231vrN+Wu7Zp2jzBNUjyFu2CszsGEqPrabty PZkg== X-Gm-Message-State: AGi0PuaKC2U7z6BikTGtNNNeIQOfZR3x4GoicrIkLpJgKvKaU3ZibQkU T2T9salYVGL/WMWctPWeqPkGNKedtDDkKQ== X-Google-Smtp-Source: APiQypLpKv/mTEh9SN92IJaogbdrwreOw8sLFoEw7Zo0QJRoelWBcQh18FKDlsMwRdrWQm2i7h2N+w== X-Received: by 2002:a05:6402:290:: with SMTP id l16mr8164945edv.207.1587250292396; Sat, 18 Apr 2020 15:51:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:51:31 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org Cc: Guoqing Jiang , Song Liu , linux-raid@vger.kernel.org Subject: [PATCH 5/5] md-bitmap: don't duplicate code for __clear_page_buffers Date: Sun, 19 Apr 2020 00:51:23 +0200 Message-Id: <20200418225123.31850-6-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 After __clear_page_buffers is exported, we can use it directly instead of copy the implementation. Cc: Song Liu Cc: linux-raid@vger.kernel.org Signed-off-by: Guoqing Jiang --- drivers/md/md-bitmap.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c index b952bd45bd6a..a1464417ada6 100644 --- a/drivers/md/md-bitmap.c +++ b/drivers/md/md-bitmap.c @@ -324,14 +324,6 @@ static void end_bitmap_write(struct buffer_head *bh, int uptodate) wake_up(&bitmap->write_wait); } -/* copied from buffer.c */ -static void -__clear_page_buffers(struct page *page) -{ - ClearPagePrivate(page); - set_page_private(page, 0); - put_page(page); -} static void free_buffers(struct page *page) { struct buffer_head *bh;