From patchwork Mon Oct 23 21:40:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 829674 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uInkygRH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yLVKQ54H8z9sPt for ; Tue, 24 Oct 2017 08:44:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932359AbdJWVoJ (ORCPT ); Mon, 23 Oct 2017 17:44:09 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:43302 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbdJWVmV (ORCPT ); Mon, 23 Oct 2017 17:42:21 -0400 Received: by mail-it0-f67.google.com with SMTP id k70so6822015itk.0; Mon, 23 Oct 2017 14:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wiAoc0JHIPz4HAo1BFCpnFyXTNkBIyNbTooXOraiqBE=; b=uInkygRHFd34bCPKGXqHDVXFaWKgpkAJENWTj8+6DxI/CVmkZ2vUM9R9cxo8lz97t7 2YMFfSN+elcoCimm90w4Lxlon1wjrCRLfYcYZpZLzaNcJgxaIR+iUUVAjN32o81OtQaV Z/zCIs5dwVcl973xb8pbystw/6rm74XgEmLnk24EfGRgYJwAcud6sqTI/7/DjrROCyCA k1OYThU0y5hyJkQlelNsg6fBGw/qNIuHEIuuLIB94gDtDvW2ZVs2sp+TdqEQqqIKMWOS DhZMyFr1ni05VcDwKjPGEPD0kQd11FAkoxuiMtyMl6nmA4ztcNb9q+XPIjhcvyTtvPxm R+fA== 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=wiAoc0JHIPz4HAo1BFCpnFyXTNkBIyNbTooXOraiqBE=; b=LKndq1JDXlyMEeTr4djzDJB8w4/C5jHUW4lNccykg2OKXyt7OX1d2IuygIO2YBpzly QNhfElxsunoI8JlDgH99sx16eazweJT3Geb7/esuwEhaDJpxCbVnJy69JQet0hvE69R1 We5Sxn5dsPLEgxBRW/LmTWhLEGSGOs6dZ1KQFU8GOWZn/vE7v6+r/y5yg3cYsMyhYfU7 hvjFkPJ4EpNzAK8TVHj6y9Bqo7rjoNXCaVrI5MG37LPzS2JlmiHjXEYi9OkIGldWERQn mzMs0Hx2AQRoj6p61uDtmXsnvtYCNNhtGSBwTbMUHTAn4Z+p1d1VtpAFK2sbe/yuAHWj KlJw== X-Gm-Message-State: AMCzsaXog2Fc/mSyFxHw5q+8MnpmULAWgwWv7LfSR0PMRSBuchUeW6vn dLig/BxFZsM3KBTfY96x560dljFg X-Google-Smtp-Source: ABhQp+QklVKqmOxvS5EPAR1bGWPJimKjCOvUruutksE3uobbNpP7koBEHKEQEWTx+iR3pEu0xgHf+A== X-Received: by 10.36.77.131 with SMTP id l125mr10541183itb.7.1508794940291; Mon, 23 Oct 2017 14:42:20 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.175.88]) by smtp.gmail.com with ESMTPSA id i63sm3558482ioi.68.2017.10.23.14.42.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 14:42:19 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-api@vger.kernel.org, keyrings@vger.kernel.org, "Theodore Y . Ts'o" , Jaegeuk Kim , Gwendal Grignou , Ryo Hashimoto , Sarthak Kukreti , Nick Desaulniers , Michael Halcrow , Eric Biggers Subject: [RFC PATCH 08/25] fs/inode.c: rename and export dispose_list() Date: Mon, 23 Oct 2017 14:40:41 -0700 Message-Id: <20171023214058.128121-9-ebiggers3@gmail.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171023214058.128121-1-ebiggers3@gmail.com> References: <20171023214058.128121-1-ebiggers3@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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, export dispose_list() to modules. For clarity also rename it to evict_inode_list(). Signed-off-by: Eric Biggers --- fs/inode.c | 19 ++++++++++--------- include/linux/fs.h | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 30ce98956801..fe47930835c0 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -570,13 +570,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; @@ -588,6 +588,7 @@ static void dispose_list(struct list_head *head) cond_resched(); } } +EXPORT_SYMBOL_GPL(evict_inode_list); /** * evict_inodes - evict all evictable inodes for a superblock @@ -628,13 +629,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); @@ -679,7 +680,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; } @@ -763,7 +764,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) { @@ -772,7 +773,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 2833ace2f01d..e0a8dae5f9dc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2880,6 +2880,7 @@ extern void unlock_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 *);