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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 44A6FC55178 for ; Mon, 26 Oct 2020 15:19:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ED1AE223EA for ; Mon, 26 Oct 2020 15:19:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="cqyQyYbV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED1AE223EA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 502556B0068; Mon, 26 Oct 2020 11:19:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B5166B0073; Mon, 26 Oct 2020 11:19:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 353236B008A; Mon, 26 Oct 2020 11:19:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id 034086B0068 for ; Mon, 26 Oct 2020 11:19:03 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 8D2563625 for ; Mon, 26 Oct 2020 15:19:03 +0000 (UTC) X-FDA: 77414434566.30.bulb54_41161f427274 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 213F0180B3C94 for ; Mon, 26 Oct 2020 15:18:56 +0000 (UTC) X-HE-Tag: bulb54_41161f427274 X-Filterd-Recvd-Size: 3305 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Mon, 26 Oct 2020 15:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=n6jFmTk/80oHxPEc+nlR48Wkyjmo4dNW4K8OCdeXgjc=; b=cqyQyYbVduDoU3LlPdawStRBcd k9JKZ+usT65v41U/kLQGzsIoTLB8YIR/y+XXv6cMlG5/JFW2duXDhmP0Gu0+9qRCCapfrrYocaatu ySYb84BhcAy7X0lhT64cHWlFJ2aXsIYWqrEOan6cj2T3jCiprarTM/mAwWcoyYXu9uxFwq6ppC9wq j4bIcU8LTet1YgryCUth5WgKFxg9qI1g79p3q5TzRjtdBD8V4bdU+yo0UifODu2CZ8zVoPYDgLhdF +ieu3P/fTScHyp6aP82usGr+N2NvhokP4nmIES+BPRPcduCTR2fwPHw4JZibcqQFulcI6BtnYIpQJ CBt1EKcA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX4Gp-0006K8-U9; Mon, 26 Oct 2020 15:18:51 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, Vishal Verma Subject: [PATCH v2 4/4] mm: Remove nrexceptional from inode Date: Mon, 26 Oct 2020 15:18:49 +0000 Message-Id: <20201026151849.24232-5-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201026151849.24232-1-willy@infradead.org> References: <20201026151849.24232-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: We no longer track anything in nrexceptional, so remove it, saving 8 bytes per inode. Signed-off-by: Matthew Wilcox (Oracle) Tested-by: Vishal Verma --- fs/inode.c | 2 +- include/linux/fs.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 9d78c37b00b8..4531358ae97b 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -530,7 +530,7 @@ void clear_inode(struct inode *inode) */ xa_lock_irq(&inode->i_data.i_pages); BUG_ON(inode->i_data.nrpages); - BUG_ON(inode->i_data.nrexceptional); + BUG_ON(!mapping_empty(&inode->i_data)); xa_unlock_irq(&inode->i_data.i_pages); BUG_ON(!list_empty(&inode->i_data.private_list)); BUG_ON(!(inode->i_state & I_FREEING)); diff --git a/include/linux/fs.h b/include/linux/fs.h index 0bd126418bb6..a5d801430040 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -439,7 +439,6 @@ int pagecache_write_end(struct file *, struct address= _space *mapping, * @i_mmap: Tree of private and shared mappings. * @i_mmap_rwsem: Protects @i_mmap and @i_mmap_writable. * @nrpages: Number of page entries, protected by the i_pages lock. - * @nrexceptional: Shadow or DAX entries, protected by the i_pages lock. * @writeback_index: Writeback starts here. * @a_ops: Methods. * @flags: Error bits and flags (AS_*). @@ -460,7 +459,6 @@ struct address_space { struct rb_root_cached i_mmap; struct rw_semaphore i_mmap_rwsem; unsigned long nrpages; - unsigned long nrexceptional; pgoff_t writeback_index; const struct address_space_operations *a_ops; unsigned long flags; --=20 2.28.0