From patchwork Sun Apr 26 21:49:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11511037 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 740A015AB for ; Sun, 26 Apr 2020 21:50:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B8A32071C for ; Sun, 26 Apr 2020 21:50:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="VAfCURwT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726227AbgDZVtu (ORCPT ); Sun, 26 Apr 2020 17:49:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726184AbgDZVtt (ORCPT ); Sun, 26 Apr 2020 17:49:49 -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 0EE30C061A41 for ; Sun, 26 Apr 2020 14:49:49 -0700 (PDT) Received: by mail-ed1-x543.google.com with SMTP id g16so12024875eds.1 for ; Sun, 26 Apr 2020 14:49:48 -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=aGrqSyBlWee4qlVzfbrxmXDEIitY77BfW8OPiMV+fGw=; b=VAfCURwTPIE4rJfC8KB4FYWrz+JTx0GQK6awVyjDZRrnwDaaVDjgUgtGtQZznZmmxi wFl7jNmlcKuqIyO8p7/DqWXiTjP4SvaWAQzjxmulMXt8Ts4RDHfUM3ELErJt0x5C73AC zJywnyx9Cz5oWsMeQfO4c5ejUQ+vDm3Amp7tf72mheUEv9saFlblV0qG8GxVzGe8BxvY XbgofnU5SgEU582wK1e9C5GxLR0JqVzv67TRQVvRHms797+XWJFR5orBv3ADbbrwceBM E7ucIimM6ELJKj4Xxei35ZC9m3xzeGhs+QRaifvldaOwSBMIrEuwBPzLsQUyxEp4i+95 N6LA== 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=aGrqSyBlWee4qlVzfbrxmXDEIitY77BfW8OPiMV+fGw=; b=cnjLv7Ipobz2VarXY82Zl4MBBmfSSxsvwnbL4gsrw981zzzlOaPjVMvt9Sd7pIzyAv 9Sa0fflZ5JbAOeeIl1fRJuxLRzUF7VXq+UfG36nirR6d4K7dyREQ8jhRFHz7oU37AGbv kUUdNON/tVpKjsBMb8DQkqDiWNl84JTGatGim+MpRtKJXndftY18FKcXSLV7TZfizt51 HkM2/QLRwSlK6NDBTy8SaAyOeov/2aBVoTCFHN3e2d8bCh6/ztZV549eFMVVCjGQJhGd 7XQDp/d+yOxMTnkpzNdAPG14IHumyRRby+IxCzml8JKFILCgUmLQ+pKWd3KSSBMMDMU/ 60Sg== X-Gm-Message-State: AGi0Pub2el4d5/udqoNdiwFuAlXyRh7OuxG00U3bnmmN4pwgEkuwFNQX wKZh6iSqYerei6623p0EYBA+TOtcKzABkBiz X-Google-Smtp-Source: APiQypL9pOXchtRNeUI9SqBMUqUJAL/dQ0McZChbYcK3Npoe5VpBYEa/V2WAwgwMmnQc4QcKjJFF6w== X-Received: by 2002:a05:6402:356:: with SMTP id r22mr17183505edw.3.1587937787466; Sun, 26 Apr 2020 14:49:47 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:46 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Andrew Morton , "Darrick J. Wong" , William Kucharski , "Kirill A. Shutemov" , Andreas Gruenbacher , Yang Shi , Yafang Shao Subject: [RFC PATCH 1/9] include/linux/pagemap.h: introduce set/clear_fs_page_private Date: Sun, 26 Apr 2020 23:49:17 +0200 Message-Id: <20200426214925.10970-2-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 The logic in attach_page_buffers and __clear_page_buffers are quite paired, but 1. they are located in different files. 2. attach_page_buffers is implemented in buffer_head.h, so it could be used by other files. But __clear_page_buffers is static function in buffer.c and other potential users can't call the function, md-bitmap even copied the function. So, introduce the new set/clear_fs_page_private to replace them since they are mostly used in fs layer. With the new pair of function, we will remove the usage of attach_page_buffers and __clear_page_buffers in next patches. Suggested-by: Matthew Wilcox Cc: Andrew Morton Cc: "Darrick J. Wong" Cc: William Kucharski Cc: "Kirill A. Shutemov" Cc: Andreas Gruenbacher Cc: Yang Shi Cc: Yafang Shao Signed-off-by: Guoqing Jiang --- include/linux/pagemap.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index a8f7bd8ea1c6..2a165ea647fe 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -205,6 +205,28 @@ static inline int page_cache_add_speculative(struct page *page, int count) return __page_cache_add_speculative(page, count); } +static inline void *set_fs_page_private(struct page *page, void *data) +{ + get_page(page); + set_page_private(page, (unsigned long)data); + SetPagePrivate(page); + + return data; +} + +static inline void *clear_fs_page_private(struct page *page) +{ + void *data = (void *)page_private(page); + + if (!PagePrivate(page)) + return NULL; + ClearPagePrivate(page); + set_page_private(page, 0); + put_page(page); + + return data; +} + #ifdef CONFIG_NUMA extern struct page *__page_cache_alloc(gfp_t gfp); #else From patchwork Sun Apr 26 21:49:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11511017 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 5A2A815AB for ; Sun, 26 Apr 2020 21:49:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4306520700 for ; Sun, 26 Apr 2020 21:49:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="anDlxyzg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726343AbgDZVtv (ORCPT ); Sun, 26 Apr 2020 17:49:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726210AbgDZVtu (ORCPT ); Sun, 26 Apr 2020 17:49:50 -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 25497C09B052 for ; Sun, 26 Apr 2020 14:49:50 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id gr25so12456028ejb.10 for ; Sun, 26 Apr 2020 14:49:50 -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=xmVUgxR4RkezqKBk0fRvQI3+2wLIZJ7zmozB8jZORxA=; b=anDlxyzgROe5uD6yg0m6HW1PUaakY+m40DdicyefRKrxKyIZGl7Jshydu0kr872GNe /i1TnxhxjuU4rEjAMUbx5fJcYlcKgxKzuqUD+owhUZp+tcz3maXUuHBrPRqL0OXgEYiA rIXAfi/rtOagy1a/o50Q8fxmx5BCVVp14DmJnHr1V/GvvL/Mt4U/q7kkZ84Hj10Gjp0I AH1/kGG3wyMyq/jqu2dcKBG+6IuCF7Pryi+cFSw9tB1Y17Xmow8XJOpxh4SVnuFsLG+f 8IWT9gV2fdMe8Wtto7bNKvaO/MquUmrwJ9LKrx6EnNMzwlKpIsCxNWRPFgv1F9T8FjGe rBwQ== 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=xmVUgxR4RkezqKBk0fRvQI3+2wLIZJ7zmozB8jZORxA=; b=E75aR1qw/6tW1RF2Pv6xzKieLgDnZmcJKsk9T+WKEJ6v64FEP+jWWW96pKGjawYfwv cA3SQnoFqJNd7oFrMB9UOa6BLAOU/QBH29x+cJLsu404Fzckfb7vcuWjuu4OLvKHxut2 ZkVJJh2iFdei/oTfS6p/n4hL1r06CQLy9ktimlWy/RHGPk0Kuv5lICXMef0T1NugHqu0 JdTjoABKtyOqjN4+F425RdtNdAuntUGn3sYE8DDIFMzRTk27Zh71+y5442hnjgdpLcC2 J4W0zQT1JtBQ9sHL+L5QEZvomXyoaezB7dEzcD2BmJo2S9b670oXMXsJ6zH+vfyPj0xm J7ig== X-Gm-Message-State: AGi0PubrIrqinXOkpCVPnZq6fDrPx/hWlQeoOw9Kz4hS2z82u4CNfoB9 tiOY5nCyA/i3+0+PCdZiqxgCZ2o2RWqxyQ== X-Google-Smtp-Source: APiQypIJg5ZBPDjk8zuYwSPioxFnrrJmJZ6e8E9h5lzaJIzlYqV42JDaS97GOWPsGEzoA3fm2GMRlQ== X-Received: by 2002:a17:906:1490:: with SMTP id x16mr15873490ejc.323.1587937788622; Sun, 26 Apr 2020 14:49:48 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:47 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Song Liu , linux-raid@vger.kernel.org Subject: [RFC PATCH 2/9] md: remove __clear_page_buffers and use set/clear_fs_page_private Date: Sun, 26 Apr 2020 23:49:18 +0200 Message-Id: <20200426214925.10970-3-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 introduce set/clear_fs_page_private in pagemap.h, we can remove the duplicat code and call the new functions. Cc: Song Liu Cc: linux-raid@vger.kernel.org Signed-off-by: Guoqing Jiang --- drivers/md/md-bitmap.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c index b952bd45bd6a..b935473c82b7 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; @@ -345,7 +337,7 @@ static void free_buffers(struct page *page) free_buffer_head(bh); bh = next; } - __clear_page_buffers(page); + clear_fs_page_private(page); put_page(page); } @@ -374,7 +366,7 @@ static int read_page(struct file *file, unsigned long index, ret = -ENOMEM; goto out; } - attach_page_buffers(page, bh); + set_fs_page_private(page, bh); blk_cur = index << (PAGE_SHIFT - inode->i_blkbits); while (bh) { block = blk_cur; From patchwork Sun Apr 26 21:49: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: 11511027 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 75B1392A for ; Sun, 26 Apr 2020 21:50:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D09621556 for ; Sun, 26 Apr 2020 21:50:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="XJUCf4/P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726400AbgDZVty (ORCPT ); Sun, 26 Apr 2020 17:49:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726200AbgDZVtw (ORCPT ); Sun, 26 Apr 2020 17:49:52 -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 1ECF1C09B051 for ; Sun, 26 Apr 2020 14:49:51 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id r7so11991953edo.11 for ; Sun, 26 Apr 2020 14:49:51 -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=8YZX6HD1KfYztNlIB7+yLvJefwmGiH93TRfGwqC7PeQ=; b=XJUCf4/P3uV7oFMdxzQRFCOfUhzfFQc4G4aSbcspZJ2OiUwRdTeqHaiQFn/uzJVy6n WgYCFN8XMPbZLNkfr+vzFpVAGFJcgOV0pdRmEDQlWGUiaxVtwbptV51UEtbu8ZXVJWyT iaKsrKOnwwMPfg3OnjKyeGklbYVWoJUlGMZ1WAaBDgSvflIxeWcnfuID+FvQGkMKA1JQ YZHXUyTj4ZE6tToXQJVaSVe5/3Lw+SZkhPxruuz+5fw8on+HwDGLZKhP1LB62SUcC7ST 3emBtqDQ/v+fZdnLeYcjEvFBd0u4IVV93UqT8I5UkEok0FOAq0qHFraUswdzR+xuJ3VM BFQQ== 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=8YZX6HD1KfYztNlIB7+yLvJefwmGiH93TRfGwqC7PeQ=; b=G0CM6sLH7S3HTnLmOpC8AVqQ5hlLR9v7Us1RFep/W3undcQbxxxdlPhwMICqK4/KeG m5JLCDsU4iTQtgomoO13LZktu+L7KwzbsuDY5y0iRokyiIgxbW0cUNJ8tfb78tuVNGML /3s+TM4MrZT5FF4vqwON9TbCS1ZKhiwrR7ar0ErsxIXoUhs2JFAh/V18A8VV/z4CJ6dl miGxiiAqjAg6p8SRloovcwzYmeO3yxzTr0DI3aPCf7HOLRzPARLVkvDYrmtQiClIYIse uJUM0LFQzk/kkNTTW3bKu5cktrcwVvvSdpUOVuW0KMiMiqcjPHQ/WH6wMQsBCfhv++AE +5Fg== X-Gm-Message-State: AGi0PuaCvDAu0st6oFPi4MTjVMN1Vsp8ing179jK4fbvvB2nFyp+zoBM XxNWCM7M8XewrnPQmhB/qibMguVKYMVj+r5U X-Google-Smtp-Source: APiQypLl2Ehi4h73KGGNsjckSs7WvC6lIR9KZ34gD4K2jG94Yygdx+ppB+/wUZoUStYLcS5AnUW+Lw== X-Received: by 2002:a05:6402:31b1:: with SMTP id dj17mr15648996edb.146.1587937789583; Sun, 26 Apr 2020 14:49:49 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:48 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org Subject: [RFC PATCH 3/9] btrfs: use set/clear_fs_page_private Date: Sun, 26 Apr 2020 23:49:19 +0200 Message-Id: <20200426214925.10970-4-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 the new pair function is introduced, we can call them to clean the code in btrfs. 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 | 4 +--- fs/btrfs/extent_io.c | 21 ++++++--------------- fs/btrfs/inode.c | 17 ++++------------- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index a6cb5cbbdb9f..1230863e80f9 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -980,9 +980,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_fs_page_private(page); } } diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 39e45b8a5031..de8c2d5a99db 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3076,22 +3076,16 @@ static int submit_extent_page(unsigned int opf, static void attach_extent_buffer_page(struct extent_buffer *eb, struct page *page) { - if (!PagePrivate(page)) { - SetPagePrivate(page); - get_page(page); - set_page_private(page, (unsigned long)eb); - } else { + if (!PagePrivate(page)) + set_fs_page_private(page, eb); + else WARN_ON(page->private != (unsigned long)eb); - } } void set_page_extent_mapped(struct page *page) { - if (!PagePrivate(page)) { - SetPagePrivate(page); - get_page(page); - set_page_private(page, EXTENT_PAGE_PRIVATE); - } + if (!PagePrivate(page)) + set_fs_page_private(page, (void *)EXTENT_PAGE_PRIVATE); } static struct extent_map * @@ -4929,10 +4923,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_fs_page_private(page); } if (mapped) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 320d1062068d..07871c57ba96 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_fs_page_private(page); return ret; } @@ -8331,11 +8328,9 @@ static int btrfs_migratepage(struct address_space *mapping, if (page_has_private(page)) { ClearPagePrivate(page); - get_page(newpage); - set_page_private(newpage, page_private(page)); + set_fs_page_private(newpage, (void *)page_private(page)); set_page_private(page, 0); put_page(page); - SetPagePrivate(newpage); } if (PagePrivate2(page)) { @@ -8458,11 +8453,7 @@ 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); - } + clear_fs_page_private(page); } /* From patchwork Sun Apr 26 21:49: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: 11511033 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 148AD15AB for ; Sun, 26 Apr 2020 21:50:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F135521556 for ; Sun, 26 Apr 2020 21:50:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="Jp65FI7L" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726488AbgDZVuV (ORCPT ); Sun, 26 Apr 2020 17:50:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbgDZVtx (ORCPT ); Sun, 26 Apr 2020 17:49:53 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23B52C061A41 for ; Sun, 26 Apr 2020 14:49:52 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id s9so12494664eju.1 for ; Sun, 26 Apr 2020 14:49:52 -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=Nk7EV8qONapDcMrz48oPwtLT8Zin9+cq+j0iMab0m4A=; b=Jp65FI7Lo+Cn8/FOgWCuXZHNnKbn3DioxWHStDkNrmH2gVOtVcURqIHsod5j6u5BLR /bzkNSBHvR65E7Cc8qY4fKAkGe64M3OAQyMWt4e89dAlgVvLImCOAq02qBwmXSn+VHvK T3Ei+CxAHR2A+azyaRyZCEtKDP0LyhjtDBp4T4MPxOCW8FBvLTK1mMFO06vPCAhZC/UZ 4Y365TApm81j5lGrkPGBW0G54qzQUXcDXG2jNf7vIprZiYAlXUdj7DbHP0JH2jfk4bsF p7Jkpb1gKLj0A7hYSunF2Dox+xkU5KikPl1Pl0jESVe7A/kkxilmSAif+MqAH2hA6/up oM+w== 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=Nk7EV8qONapDcMrz48oPwtLT8Zin9+cq+j0iMab0m4A=; b=c+wYV9Z1xF2EmtQbNcN7tBcJ2T9MvFrnge4Eu74F/D7ke8Gc3kSHcu7+K1TztY3qB6 phIhAH/Oy/BpOsol8klt4EMC4bbq21yFHRNvOlNTFcA/fcGaF4VvDGgKLxvrbZkdS/ih wpuvS/bUfqIXu5hqQj8rH2e6Idu7yDSiysi4KNlyhfkExHggNxk3ABOYSpTwt8CQFdia ZcBG0mV+IC2q/LZx4/kd22hc0F9hEpI+bx3/SEqLT+fnlbYuoz9enRnjTSjq4IZj6nVj 9Xrp3QQ0K8vOQQ1rTgJ7shrVuhrHmK9U+qRoCwAq1jqiWfiSE1AI0xMYQSEmnMWEcmRM EAKA== X-Gm-Message-State: AGi0PubdGOup4uLySxgb8ENXtkmkIb0rY/xEDq1HwQqqlTh58PNY7Taz SGd9E75iOUOvuf2rUm6qYC7zz2GFLngJ5csf X-Google-Smtp-Source: APiQypIPM3/WHEI2bnt8PhQVPXZZ9xFUarLWq3VdADMkJuzy3kZOX2mY6i1kz2a/wwgLRKeFp4qKZQ== X-Received: by 2002:a17:906:6b05:: with SMTP id q5mr16557099ejr.329.1587937790675; Sun, 26 Apr 2020 14:49:50 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:50 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Alexander Viro Subject: [RFC PATCH 4/9] fs/buffer.c: use set/clear_fs_page_private Date: Sun, 26 Apr 2020 23:49:20 +0200 Message-Id: <20200426214925.10970-5-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 the new pair function is introduced, we can call them to clean the code in buffer.c. Cc: Alexander Viro Signed-off-by: Guoqing Jiang --- fs/buffer.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index a60f60396cfa..1d9b32e77c2b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -123,14 +123,6 @@ void __wait_on_buffer(struct buffer_head * bh) } EXPORT_SYMBOL(__wait_on_buffer); -static void -__clear_page_buffers(struct page *page) -{ - ClearPagePrivate(page); - set_page_private(page, 0); - put_page(page); -} - static void buffer_io_error(struct buffer_head *bh, char *msg) { if (!test_bit(BH_Quiet, &bh->b_state)) @@ -906,7 +898,7 @@ link_dev_buffers(struct page *page, struct buffer_head *head) bh = bh->b_this_page; } while (bh); tail->b_this_page = head; - attach_page_buffers(page, head); + set_fs_page_private(page, head); } static sector_t blkdev_max_block(struct block_device *bdev, unsigned int size) @@ -1580,7 +1572,7 @@ void create_empty_buffers(struct page *page, bh = bh->b_this_page; } while (bh != head); } - attach_page_buffers(page, head); + set_fs_page_private(page, head); spin_unlock(&page->mapping->private_lock); } EXPORT_SYMBOL(create_empty_buffers); @@ -2567,7 +2559,7 @@ static void attach_nobh_buffers(struct page *page, struct buffer_head *head) bh->b_this_page = head; bh = bh->b_this_page; } while (bh != head); - attach_page_buffers(page, head); + set_fs_page_private(page, head); spin_unlock(&page->mapping->private_lock); } @@ -3227,7 +3219,7 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free) bh = next; } while (bh != head); *buffers_to_free = head; - __clear_page_buffers(page); + clear_fs_page_private(page); return 1; failed: return 0; From patchwork Sun Apr 26 21:49: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: 11511031 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 1471015AB for ; Sun, 26 Apr 2020 21:50:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0BAC2098B for ; Sun, 26 Apr 2020 21:50:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="PQHhUt4Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726495AbgDZVuV (ORCPT ); Sun, 26 Apr 2020 17:50:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726381AbgDZVtx (ORCPT ); Sun, 26 Apr 2020 17:49:53 -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 F3B3EC09B052 for ; Sun, 26 Apr 2020 14:49:52 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id n4so12440631ejs.11 for ; Sun, 26 Apr 2020 14:49:52 -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=EVShq73FSgP/iPd7sAu/gmu6WN22oBRzfyOsdhWlH7E=; b=PQHhUt4QYQ2lcD4jntv56PBlw8VdGuIt0HSBR79UTYajgyZK0++h/tPZu2kqq35XIu VQv5xha59bI/qnB/aXKoYi6BjZIINrM77x90Cgp6DjnmaHXEsm8ljA77zdoEMfWSD+fI 3f4bUgA12mwtiRNTtGM3Q13n5EcbuVHKwT8C2ih3iEjeaa9/d4NW/1V0gsbc1ikhBIDI /1LZ5Vzn6deZu3/DnXr2bR20wJJjvM+5C9qPDftdJdgSrwBaTLd+3F3ISpapRW24rpKR y2Lt4zcbxvN74rzniBO05POHASY5jnQlgLyAqNPyp9MtgdgEeV9UXduqimBOYxBDV6BO cn+w== 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=EVShq73FSgP/iPd7sAu/gmu6WN22oBRzfyOsdhWlH7E=; b=H5JCM8Da1YpmgtTeOCc5Tyva4AezL0VvzzcYlgOBbvJCQd6ALyj3m1W7hkr2xkfmxm xnfFxNV6lFL4xS30gjcpo2/g6Jm8qFBVSZHQXgSzG1EXYTGAX/UyXqQHw+kZSYx2MglF AaamQJiXNYzI2xosIZulOP5M0eIdjVIEn/Nxv9m4l/qltjvAxpJy63Kc4fJd9ipLgqmr sLVuQcAhBHW8MtqwUWcq2BnH6UocJ7L/ZmSQu5T3gJ7944F8CXngTEqrP19GXTlVLXs1 BJcz6l+EVa6uXuhJocHrj2dAine7cHGUnLb4bFhUWFy6Rp+Iytv8H8qPREVYJTvgAECq yNbA== X-Gm-Message-State: AGi0PuaAUO5ufyXiwAgSmE+uW0JwCmmMAMsVWOHezTrfYoDcuJ++nx9S IiWdVYCU72KFUi2xUQnBSGr6ufvXMqDbZrIq X-Google-Smtp-Source: APiQypIEBGSwt/5p1EI0EPh1JLjp11svK9dHJaYN2weAh6ctv9R1LUU52PMHSz/H21K9Jnelbw7huw== X-Received: by 2002:a17:906:7e5a:: with SMTP id z26mr17585240ejr.168.1587937791521; Sun, 26 Apr 2020 14:49:51 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:50 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [RFC PATCH 5/9] f2fs: use set/clear_fs_page_private Date: Sun, 26 Apr 2020 23:49:21 +0200 Message-Id: <20200426214925.10970-6-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 the new pair function is introduced, we can call them to clean the code in f2fs.h. Cc: Jaegeuk Kim Cc: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net Signed-off-by: Guoqing Jiang Acked-by: Chao Yu --- fs/f2fs/f2fs.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ba470d5687fe..70ad8c51e0fc 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3051,19 +3051,12 @@ static inline void f2fs_set_page_private(struct page *page, if (PagePrivate(page)) return; - get_page(page); - SetPagePrivate(page); - set_page_private(page, data); + set_fs_page_private(page, (void *)data); } static inline void f2fs_clear_page_private(struct page *page) { - if (!PagePrivate(page)) - return; - - set_page_private(page, 0); - ClearPagePrivate(page); - f2fs_put_page(page, 0); + clear_fs_page_private(page); } /* From patchwork Sun Apr 26 21:49: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: 11511029 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 D5B9292A for ; Sun, 26 Apr 2020 21:50:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BCD262071C for ; Sun, 26 Apr 2020 21:50:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="OwNMupnS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726410AbgDZVuT (ORCPT ); Sun, 26 Apr 2020 17:50:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726384AbgDZVty (ORCPT ); Sun, 26 Apr 2020 17:49:54 -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 EEA81C061A10 for ; Sun, 26 Apr 2020 14:49:53 -0700 (PDT) Received: by mail-ed1-x543.google.com with SMTP id d16so12018728edv.8 for ; Sun, 26 Apr 2020 14:49:53 -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=je11VssEqcRjDcQQUY7TMs+S/p8Pe+y4zVJlfwO1AIY=; b=OwNMupnSJkBuaJfMXeCgM1rYXjTmzIAla+tSBp7FYda6Z0do31Tv6/LqXGLMcBBWhG nqjIhBJEalueOvj9V2LZ+TuLLeFNIXzVb6OK45n66rzci+x/eJxewCUOYOo06dTayDKj B5iJ94emWcTjwQbgVlPIpz9Lz++7r/aQF//fpjSxu2/XNpEhrL+lHBErqiCynz5SbjB2 iW4ERClUfrgtnD0QmDonsDibcZjmNyxtpI2M/DaGWxbm7W5qNx0fPMGF44KjexJ6P8/1 2LGOGXLbZT3PVyAX3yAvtCf/8vJUr85wyASdWC+0wMGkNwBqVxwGJ+99/wys6z7wxDo+ YYVA== 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=je11VssEqcRjDcQQUY7TMs+S/p8Pe+y4zVJlfwO1AIY=; b=SZu6kNuNzgkHoD4MvVwG1zkbNvLRv6FnZQKNvi76ZCAHZNU9+hxu2ACPGNvWHJLsxx +rAR2QOilgLHW3yTtPAcieVdtkTXN9iMZPASsk6DrzRGmrvHWWFNotV39e59CY29IcKW soZp4a3rKXuN+XHOJ0kvXiViGuvq3JZ2bjrF6fpsRbjkvGz62B4LjDBXDFJoV7/sUURG xEiPx7VWpY53eO94rmeEqigrcacxLNvHgDFDDYkPV/1I4Gm8iqeUTvXkNjhz4gOG9jp3 0pjezBBhhKmZVvADJnkr7+s8vQmcwF8CSAtJbNxCFe4k+QY+BdYXMxBQwYJyZCiQiGTa EP4Q== X-Gm-Message-State: AGi0PubAGyVODh9GwutOCY9UckYD07VJwX9xaZPsgfvJ07PRaBkEFNBj GbpcRG0Rw7+5DCRA+2zTLoVhTUJ4YBTqaLY0 X-Google-Smtp-Source: APiQypLeC6iTKrMS3r2CPJ1hgROOG19gCAO83wMvAt7p0NE0/jtP9fk8m1Bkoh+kIZpagKS8bUmlOQ== X-Received: by 2002:a50:99c4:: with SMTP id n4mr16930973edb.187.1587937792458; Sun, 26 Apr 2020 14:49:52 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:51 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , "Darrick J. Wong" , linux-xfs@vger.kernel.org Subject: [RFC PATCH 6/9] iomap: use set/clear_fs_page_private Date: Sun, 26 Apr 2020 23:49:22 +0200 Message-Id: <20200426214925.10970-7-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 the new pair function is introduced, we can call them to clean the code in iomap. Cc: Christoph Hellwig Cc: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org Signed-off-by: Guoqing Jiang --- fs/iomap/buffered-io.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 89e21961d1ad..cc48bf4f1193 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -59,24 +59,18 @@ iomap_page_create(struct inode *inode, struct page *page) * 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); - return iop; + return (struct iomap_page *)set_fs_page_private(page, iop); } static void iomap_page_release(struct page *page) { - struct iomap_page *iop = to_iomap_page(page); + struct iomap_page *iop = clear_fs_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); } @@ -556,11 +550,9 @@ iomap_migrate_page(struct address_space *mapping, struct page *newpage, if (page_has_private(page)) { ClearPagePrivate(page); - get_page(newpage); - set_page_private(newpage, page_private(page)); + set_fs_page_private(newpage, (void *)page_private(page)); set_page_private(page, 0); put_page(page); - SetPagePrivate(newpage); } if (mode != MIGRATE_SYNC_NO_COPY) From patchwork Sun Apr 26 21:49: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: 11511019 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 2BCA592A for ; Sun, 26 Apr 2020 21:50:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12BED20700 for ; Sun, 26 Apr 2020 21:50:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="CNngllvg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726413AbgDZVt4 (ORCPT ); Sun, 26 Apr 2020 17:49:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbgDZVtz (ORCPT ); Sun, 26 Apr 2020 17:49:55 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03624C09B050 for ; Sun, 26 Apr 2020 14:49:55 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id re23so12482015ejb.4 for ; Sun, 26 Apr 2020 14:49:54 -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=Iy5dbJ5ulEBQZnVYe4LdimJwxmRBu3H1I8kAoywkhO4=; b=CNngllvg67ixykLg7cIJmP9idgw85CRV9miXlKw51shYgZp8X7u0kscny53amrBTHc 911VnBxmwMuOV4SMj0chVxA/OMGNGdYUJIvzcQY/1rcco/Mso860J2eU88rH1GapiEOf Lk5647aRv60gkMz62Di52oIsDnE1MnHVDvMWsDKr7xXXLrfk0hSblYlNC7L9OB5nBYTz 0eY+qIPp8bjWHmcEmAzKTNtLyLaF3FQTM05XLfoOp5jpG4gvO9k5PW0q0qwnt/BOvI6w juUApwcHoJ/i5G0Pds+09eEE7A53kzuE0TnqRhvo9v7tEzJM9ViaeYaCS4t/KJ5QCYC6 kcmA== 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=Iy5dbJ5ulEBQZnVYe4LdimJwxmRBu3H1I8kAoywkhO4=; b=KiUGW/2gJfrwFIUYv9xpE/rS2iVuJlA08nTWLWFbI6oYC70NBkDyI7tcE8rapyY8VD 6qqOTKneS9z6BwM2djHkX/I3eLSy06B0ZKAkODrhTJUBq90UPcyty5A9GXCObMKEkn+f EuZlNAQZZ0TkDwsOumcVn9Nx+j98sZa03PPe+MT3s11Zfl3/q2njyn6ChohneI3IiXGR 5ja7ptgSlQu8VThstDekJf1OfCJD2hX8xygzrzXKdOscECpZjJ4m7nX4rYKqC/LC1hmT PF7MbFAfwCqpX5OpdOajjMRuN6cU7Gc9ESeJeP2/tWB1uwERwxQ//se6vkQk9LfEI+SA 5DGQ== X-Gm-Message-State: AGi0PuYqgsmOUdDaEPQeFgqN8RtaTjZgbOuuHh4STKD57mdgVODJgdE9 b8YKLW+Yi3kerqxjp1UOXxhKUBySv5R2PEyF X-Google-Smtp-Source: APiQypJatlHYD59JEc271Gli6C08LancT/2sGpWnY7Tf056t/k2L5Citpx+qKcX3OmqZHaINj2ZELA== X-Received: by 2002:a17:906:6856:: with SMTP id a22mr17551863ejs.115.1587937793540; Sun, 26 Apr 2020 14:49:53 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:52 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Anton Altaparmakov , linux-ntfs-dev@lists.sourceforge.net Subject: [RFC PATCH 7/9] ntfs: replace attach_page_buffers with set_fs_page_private Date: Sun, 26 Apr 2020 23:49:23 +0200 Message-Id: <20200426214925.10970-8-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 Call the new function since attach_page_buffers will be removed. Cc: Anton Altaparmakov Cc: linux-ntfs-dev@lists.sourceforge.net Signed-off-by: Guoqing Jiang --- fs/ntfs/aops.c | 2 +- fs/ntfs/mft.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index 554b744f41bf..d8c60e5793c0 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -1732,7 +1732,7 @@ void mark_ntfs_record_dirty(struct page *page, const unsigned int ofs) { bh = bh->b_this_page; } while (bh); tail->b_this_page = head; - attach_page_buffers(page, head); + set_fs_page_private(page, head); } else buffers_to_free = bh; } diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index 3aac5c917afe..e61cb280aee0 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c @@ -504,7 +504,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no, bh = bh->b_this_page; } while (bh); tail->b_this_page = head; - attach_page_buffers(page, head); + set_fs_page_private(page, head); } bh = head = page_buffers(page); BUG_ON(!bh); From patchwork Sun Apr 26 21:49:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11511023 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 DEDAC15AB for ; Sun, 26 Apr 2020 21:50:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C56232071C for ; Sun, 26 Apr 2020 21:50:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="Gm5iEQRG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726476AbgDZVuJ (ORCPT ); Sun, 26 Apr 2020 17:50:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726415AbgDZVt4 (ORCPT ); Sun, 26 Apr 2020 17:49:56 -0400 Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10055C061A10 for ; Sun, 26 Apr 2020 14:49:56 -0700 (PDT) Received: by mail-ed1-x541.google.com with SMTP id p16so11993949edm.10 for ; Sun, 26 Apr 2020 14:49:55 -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=qimnPXc/z1dTWaJyW3qhOlSkB0/PAvYb4yEUYXtkvBs=; b=Gm5iEQRGXjL2eUupRJ1Bh30r73SUBX84ADcBLaYreiF3hSkQEWeKNIEUgAFgJLtLMv wPfZtMjOqDacKdHwqWjWK8uVQ188OIkqVCt146DjBGGH399nUPOYIlJkSW4dfDknFdUF 7MZbSYWDEpgvMg69WJ+M7z5zshqFGp9auxPkebka7dLFCiHYBwsu5dsfZgALElUrvwf8 DMOqEwdKpZ2bPipHuh1KAjPEo3Qe2sEvSDGUJU0QwVaiR6GH/gZlDzprRcFZ2Ke6EyZ9 yUX9cBs8ilZZTyPKS+PUWadroC9CcJIR2cNNDoHBKSUR8zw2YRZtoZQ+7apQE5HafRd2 Sbfw== 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=qimnPXc/z1dTWaJyW3qhOlSkB0/PAvYb4yEUYXtkvBs=; b=kjUhp6k3F34WZRlv4twBu1mQzD17DMhNwnj4+gCEOleOb4LTkEE+bnweUtA+0omiy4 +/j4qEi5blL9hY0rY2whZ8NGCXYrhEa5W+7itf808zwTXBEDojzISQyTdf2Epcd5MJz3 T3oSib7izuXhMTjd9/zi/jCyzQErTnPhOKJunCbI4Mja0jNJlXicLOeBXR6MZe559N6W 5GKMxqEg+V2uJcrSnYMFKKWtxqNBFrupc5UQrdvslc3VFitY5TB5rRFsSBalMiDk47bW qE29Jja27nY9cQBqSF7Xd/dRLYTXJ+2mfsNWx2FEKIQDxT763V7nVUUshUlut4S9LP4v 9hbw== X-Gm-Message-State: AGi0Pub+FuzsxUeGFt52TzzWKcZX6/m8eisAadncAdOi30GKpse0H8AB BL53idmv8yiHPX4oDep0OgwWCocifjVCw3Z2 X-Google-Smtp-Source: APiQypIxdj3EgE49EVNEoQZtKa8LHmNouU6TNbFXBP16dEsDxvsw1UYgQ/dUsGDgJvJe0Ig5v2bGJQ== X-Received: by 2002:a50:c3c2:: with SMTP id i2mr15735367edf.93.1587937794634; Sun, 26 Apr 2020 14:49:54 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:54 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Mike Marshall , Martin Brandenburg , devel@lists.orangefs.org Subject: [RFC PATCH 8/9] orangefs: use set/clear_fs_page_private Date: Sun, 26 Apr 2020 23:49:24 +0200 Message-Id: <20200426214925.10970-9-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 the new pair function is introduced, we can call them to clean the code in orangefs. Cc: Mike Marshall Cc: Martin Brandenburg Cc: devel@lists.orangefs.org Signed-off-by: Guoqing Jiang --- fs/orangefs/inode.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 12ae630fbed7..893099d36e20 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -64,9 +64,7 @@ static int orangefs_writepage_locked(struct page *page, } if (wr) { kfree(wr); - set_page_private(page, 0); - ClearPagePrivate(page); - put_page(page); + clear_fs_page_private(page); } return ret; } @@ -409,9 +407,7 @@ static int orangefs_write_begin(struct file *file, wr->len = len; wr->uid = current_fsuid(); wr->gid = current_fsgid(); - SetPagePrivate(page); - set_page_private(page, (unsigned long)wr); - get_page(page); + set_fs_page_private(page, wr); okay: return 0; } @@ -460,17 +456,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_fs_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); + clear_fs_page_private(page); /* XXX is this right? only caller in fs */ cancel_dirty_page(page); return; @@ -537,9 +529,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_fs_page_private(page); } } @@ -740,9 +730,7 @@ vm_fault_t orangefs_page_mkwrite(struct vm_fault *vmf) wr->len = PAGE_SIZE; wr->uid = current_fsuid(); wr->gid = current_fsgid(); - SetPagePrivate(page); - set_page_private(page, (unsigned long)wr); - get_page(page); + set_fs_page_private(page, wr); okay: file_update_time(vmf->vma->vm_file); From patchwork Sun Apr 26 21:49:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11511021 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 4A7CC1667 for ; Sun, 26 Apr 2020 21:50:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31E4B20700 for ; Sun, 26 Apr 2020 21:50:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="UVHO4nSP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726458AbgDZVuD (ORCPT ); Sun, 26 Apr 2020 17:50:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726437AbgDZVt6 (ORCPT ); Sun, 26 Apr 2020 17:49:58 -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 0D5B7C061A41 for ; Sun, 26 Apr 2020 14:49:57 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id a2so12493921ejx.5 for ; Sun, 26 Apr 2020 14:49:56 -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=N8gIKFIeQ8z9XfDXF8aFsZf0JuueUHPpH6m+yfXK8b8=; b=UVHO4nSPWFPUha6gMtRlBXjUrSChfrVkXAZEtZZU15RWikI+an77gAQsrAsj2TRuKY f8LhPsVlGMxZNx4YrPwaJ6tHcz//7ndRkxJqOqrnmstPz15M7dqlJlk8gd2Lq3TYW1Ec osx4eOIGOKy4DTfNKVG+bVsa6lhQm9tjU/Gny9MW7P6wTFRiU7mxiO8g/fojnB1+05DN MhOmuakavYZSMaYyJ84Nvp+ib+10DhtEG+cWtDFZQTdpQnxmXGiYr6Iv3irIuInrPx9u eALbJkHQnCwuxGwMiSlcCw5iMndeGJXPdQJCKiFTEtH4GozkC0fGF8zwGvRlvf/2resF /39A== 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=N8gIKFIeQ8z9XfDXF8aFsZf0JuueUHPpH6m+yfXK8b8=; b=QWCCKUcIzJJCP0IGfK09GxS1xds2eTAkSwVYmF3f8nQGboY1FB+08qloPg30y1McSu hw0sIJYhd7MN8QanYGtwUq4Ie3qxTclhARhIUxLt84wbPmrjbTMo1yAANlniAIiJKe9M nllyxvVbefqxU5pMC0jhncFUe/mwg+keEDlCZK8Uf4UYoKpic8M0osbyuK98HpiMxzgi qzIx9UQaGxMscze5DYkyJipiVTp6XnFrqBkHp6jiVPfnE2eY9yAysZos+a2PnoNuEw7S cGOF2er25ie9LpclZsKQp84DYruXv0jZAzefiPQ4KT8SFGBpX5cZjr9WPXTP6oUYaARM DWkQ== X-Gm-Message-State: AGi0PuZFjJ11mO8WicpXMBTR/sluhaxs9208Fcdn7uqZMHnGxRgjN21I 8I3e5hbXPIMIYNXVn2G8lEPKwbiTGAtZKyc5 X-Google-Smtp-Source: APiQypJ000Dnx98h+ZTnqQQF4cE5/V9vJpP0CmGnXbwOYfUf6hYD0XVxm08loMwo7oxpYoNuTMUnjA== X-Received: by 2002:a17:906:9450:: with SMTP id z16mr16426992ejx.166.1587937795586; Sun, 26 Apr 2020 14:49:55 -0700 (PDT) Received: from ls00508.pb.local ([2001:1438:4010:2540:fab1:56ff:feab:56b1]) by smtp.gmail.com with ESMTPSA id ce18sm2270108ejb.61.2020.04.26.14.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 14:49:55 -0700 (PDT) From: Guoqing Jiang To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@infradead.org, david@fromorbit.com, willy@infradead.org, Guoqing Jiang , Thomas Gleixner , Sebastian Andrzej Siewior , Roman Gushchin , Andreas Dilger Subject: [RFC PATCH 9/9] buffer_head.h: remove attach_page_buffers Date: Sun, 26 Apr 2020 23:49:25 +0200 Message-Id: <20200426214925.10970-10-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200426214925.10970-1-guoqing.jiang@cloud.ionos.com> References: <20200426214925.10970-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 All the callers have replaced attach_page_buffers with the new function set_fs_page_private, so remove it. Cc: Thomas Gleixner Cc: Sebastian Andrzej Siewior Cc: Roman Gushchin Cc: Andreas Dilger Signed-off-by: Guoqing Jiang --- include/linux/buffer_head.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 15b765a181b8..22fb11e2d2e0 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -272,14 +272,6 @@ void buffer_init(void); * inline definitions */ -static inline void attach_page_buffers(struct page *page, - struct buffer_head *head) -{ - get_page(page); - SetPagePrivate(page); - set_page_private(page, (unsigned long)head); -} - static inline void get_bh(struct buffer_head *bh) { atomic_inc(&bh->b_count);