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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_MUTT 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 DC8E4C004C9 for ; Wed, 8 May 2019 01:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2CF720656 for ; Wed, 8 May 2019 01:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557278370; bh=5i7eIdNJojfxilMNzT3UE9tdBE1lo9TP3u6VAZ/7kpA=; h=Date:From:To:Subject:References:In-Reply-To:List-ID:From; b=YJHlVkRxRQB47QIBgX3Y8n/O7t/pHW9EvRjne4FLfoUMl2z0OcFoN30bIVzQj0m5J PnVTxB2VtMc5uLEamkCrNfcy5KN71pbMeEv4sTrUELhjBjZl9HkOUFw+qDv6W7LhGo DAA4ueMhKIRBAL/6p6Z45VsXpl5G2eJNg9pxfx+w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726548AbfEHBT3 (ORCPT ); Tue, 7 May 2019 21:19:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:57764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726276AbfEHBT3 (ORCPT ); Tue, 7 May 2019 21:19:29 -0400 Received: from sol.localdomain (c-24-5-143-220.hsd1.ca.comcast.net [24.5.143.220]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3175E20656; Wed, 8 May 2019 01:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557278368; bh=5i7eIdNJojfxilMNzT3UE9tdBE1lo9TP3u6VAZ/7kpA=; h=Date:From:To:Subject:References:In-Reply-To:From; b=JYdGFClK/wS4M5ijJBMSwaK8Mu6pTg5H++MARjasZEHgAR8S6nHJ5DMWCqwc2jZCw 2+o1lo+jFhIy0HTpGNchX60m5H2jikXm0Z8yeGq/1G/h0DMFO8xiU/ahQrCt0gqUIA YISABQF5qhc0tKuIUHpLxG9yPjt0jUOTTjL6bCg0= Date: Tue, 7 May 2019 18:19:26 -0700 From: Eric Biggers To: Theodore Ts'o , torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, linux-fscrypt@vger.kernel.org Subject: Re: [GIT PULL] fscrypt updates for 5.2 Message-ID: <20190508011925.GB7528@sol.localdomain> References: <20190507233042.GA28476@mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190507233042.GA28476@mit.edu> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 07, 2019 at 07:30:42PM -0400, Theodore Ts'o wrote: > The following changes since commit dc4060a5dc2557e6b5aa813bf5b73677299d62d2: > > Linux 5.1-rc5 (2019-04-14 15:17:41 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt_for_linus > > for you to fetch changes up to 2c58d548f5706d085c4b009f6abb945220460632: > > fscrypt: cache decrypted symlink target in ->i_link (2019-04-17 12:43:29 -0400) > > ---------------------------------------------------------------- > Clean up fscrypt's dcache revalidation support, and other > miscellaneous cleanups. > > ---------------------------------------------------------------- > Eric Biggers (10): > fscrypt: drop inode argument from fscrypt_get_ctx() > fscrypt: remove WARN_ON_ONCE() when decryption fails > fscrypt: use READ_ONCE() to access ->i_crypt_info > fscrypt: clean up and improve dentry revalidation > fscrypt: fix race allowing rename() and link() of ciphertext dentries > fs, fscrypt: clear DCACHE_ENCRYPTED_NAME when unaliasing directory > fscrypt: only set dentry_operations on ciphertext dentries > fscrypt: fix race where ->lookup() marks plaintext dentry as ciphertext > vfs: use READ_ONCE() to access ->i_link > fscrypt: cache decrypted symlink target in ->i_link > There will be a merge conflict between "fscrypt: cache decrypted symlink target in ->i_link", and "ext4: make use of ->free_inode()" and "f2fs: switch to ->free_inode()". The correct resolutions should be fairly straightforward: static void ext4_free_in_core_inode(struct inode *inode) { fscrypt_free_inode(inode); kmem_cache_free(ext4_inode_cachep, EXT4_I(inode)); } and static void f2fs_free_inode(struct inode *inode) { fscrypt_free_inode(inode); kmem_cache_free(f2fs_inode_cachep, F2FS_I(inode)); } - Eric