From patchwork Mon Feb 11 17:27:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10806505 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 753FE17FB for ; Mon, 11 Feb 2019 17:30:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D0E92AFF4 for ; Mon, 11 Feb 2019 17:30:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5072B2AFF7; Mon, 11 Feb 2019 17:30:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2BB32AFF4 for ; Mon, 11 Feb 2019 17:30:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731378AbfBKRaW (ORCPT ); Mon, 11 Feb 2019 12:30:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:46562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730200AbfBKR3m (ORCPT ); Mon, 11 Feb 2019 12:29:42 -0500 Received: from sol.localdomain (c-107-3-167-184.hsd1.ca.comcast.net [107.3.167.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9C152222AB; Mon, 11 Feb 2019 17:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549906180; bh=d65XGeWZznXP7UUkU7ZMl8LRen0al2wftOsekyrM8RU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZDweeHhRr4HXrhtfxogG/2Pzop/eQ0dSAiyfCB6af+Mhb1dQl3jukBz7D3cnu3Hdd /Yq3UU2iPqcjYIYcdz5feE1pTaL8avFgpPnRaoEZ293uY84S8Ki6S1ZSSsryoWDMzj nxgs/i+aaOaVoklRgvbxBcs6Gpim2TEj3LVTkIDI= From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-crypto@vger.kernel.org, linux-api@vger.kernel.org, keyrings@vger.kernel.org, Satya Tangirala , Paul Crowley Subject: [RFC PATCH v2 09/20] fs/inode.c: rename and export dispose_list() Date: Mon, 11 Feb 2019 09:27:27 -0800 Message-Id: <20190211172738.4633-10-ebiggers@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211172738.4633-1-ebiggers@kernel.org> References: <20190211172738.4633-1-ebiggers@kernel.org> MIME-Version: 1.0 Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers When a filesystem encryption key is removed, we need all files which had been "unlocked" (had ->i_crypt_info set up) with it to appear "locked" again. This is most easily done by evicting the inodes. This can currently be done using 'echo 2 > /proc/sys/vm/drop_caches'; however, that is overkill and not usable by non-root users. In preparation for allowing fs/crypto/ to evict just the needed inodes, make dispose_list() non-static. For clarity also rename it to evict_inode_list(). Signed-off-by: Eric Biggers --- fs/inode.c | 18 +++++++++--------- include/linux/fs.h | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 037df483c9af..10147197c1de 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -574,13 +574,13 @@ static void evict(struct inode *inode) } /* - * dispose_list - dispose of the contents of a local list - * @head: the head of the list to free + * evict_inode_list - evict each inode in a local list of inodes + * @head: the head of the list * - * Dispose-list gets a local list with local inodes in it, so it doesn't + * This gets a local list with local inodes in it, so it doesn't * need to worry about list corruption and SMP locks. */ -static void dispose_list(struct list_head *head) +void evict_inode_list(struct list_head *head) { while (!list_empty(head)) { struct inode *inode; @@ -632,13 +632,13 @@ void evict_inodes(struct super_block *sb) if (need_resched()) { spin_unlock(&sb->s_inode_list_lock); cond_resched(); - dispose_list(&dispose); + evict_inode_list(&dispose); goto again; } } spin_unlock(&sb->s_inode_list_lock); - dispose_list(&dispose); + evict_inode_list(&dispose); } EXPORT_SYMBOL_GPL(evict_inodes); @@ -683,7 +683,7 @@ int invalidate_inodes(struct super_block *sb, bool kill_dirty) } spin_unlock(&sb->s_inode_list_lock); - dispose_list(&dispose); + evict_inode_list(&dispose); return busy; } @@ -770,7 +770,7 @@ static enum lru_status inode_lru_isolate(struct list_head *item, * Walk the superblock inode LRU for freeable inodes and attempt to free them. * This is called from the superblock shrinker function with a number of inodes * to trim from the LRU. Inodes to be freed are moved to a temporary list and - * then are freed outside inode_lock by dispose_list(). + * then are freed outside inode_lock by evict_inode_list(). */ long prune_icache_sb(struct super_block *sb, struct shrink_control *sc) { @@ -779,7 +779,7 @@ long prune_icache_sb(struct super_block *sb, struct shrink_control *sc) freed = list_lru_shrink_walk(&sb->s_inode_lru, sc, inode_lru_isolate, &freeable); - dispose_list(&freeable); + evict_inode_list(&freeable); return freed; } diff --git a/include/linux/fs.h b/include/linux/fs.h index 326cbb044596..ce18ece60da4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2987,6 +2987,7 @@ extern void discard_new_inode(struct inode *); extern unsigned int get_next_ino(void); extern void evict_inodes(struct super_block *sb); extern void inode_lru_list_del(struct inode *inode); +extern void evict_inode_list(struct list_head *head); extern void __iget(struct inode * inode); extern void iget_failed(struct inode *);