* [GIT PULL] fscrypt updates for 5.2
@ 2019-05-07 23:30 Theodore Ts'o
2019-05-08 1:19 ` Eric Biggers
2019-05-08 4:55 ` pr-tracker-bot
0 siblings, 2 replies; 3+ messages in thread
From: Theodore Ts'o @ 2019-05-07 23:30 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, linux-fscrypt
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
fs/crypto/bio.c | 8 +++-----
fs/crypto/crypto.c | 74 ++++++++++++++++++++++++++++++++++-------------------------------------
fs/crypto/fname.c | 5 +++--
fs/crypto/hooks.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++----------------
fs/crypto/keyinfo.c | 25 ++++++++++++++++++++++--
fs/crypto/policy.c | 6 +++---
fs/dcache.c | 2 ++
fs/ext4/ext4.h | 62 ++++++++++++++++++++++++++++++++++++++++++++---------------
fs/ext4/namei.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
fs/ext4/readpage.c | 2 +-
fs/ext4/super.c | 3 +++
fs/f2fs/namei.c | 17 ++++++++++-------
fs/f2fs/super.c | 3 +++
fs/namei.c | 4 ++--
fs/ubifs/dir.c | 8 +++-----
fs/ubifs/super.c | 3 +++
include/linux/dcache.h | 2 +-
include/linux/fscrypt.h | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++---------------------
18 files changed, 298 insertions(+), 144 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] fscrypt updates for 5.2
2019-05-07 23:30 [GIT PULL] fscrypt updates for 5.2 Theodore Ts'o
@ 2019-05-08 1:19 ` Eric Biggers
2019-05-08 4:55 ` pr-tracker-bot
1 sibling, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2019-05-08 1:19 UTC (permalink / raw)
To: Theodore Ts'o, torvalds, linux-kernel, linux-fscrypt
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] fscrypt updates for 5.2
2019-05-07 23:30 [GIT PULL] fscrypt updates for 5.2 Theodore Ts'o
2019-05-08 1:19 ` Eric Biggers
@ 2019-05-08 4:55 ` pr-tracker-bot
1 sibling, 0 replies; 3+ messages in thread
From: pr-tracker-bot @ 2019-05-08 4:55 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: torvalds, linux-kernel, linux-fscrypt
The pull request you sent on Tue, 7 May 2019 19:30:42 -0400:
> git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt_for_linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a9fbcd6728837268784439ad0b02ede2c024c516
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-08 4:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-07 23:30 [GIT PULL] fscrypt updates for 5.2 Theodore Ts'o
2019-05-08 1:19 ` Eric Biggers
2019-05-08 4:55 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).