From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 31 May 2015 17:34:29 +0000 (-0400)
Subject: ext4 crypto: set up encryption info for new inodes in ext4_inherit_context()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5555702955326ac1b9971f81569d8a6851384d49;p=linux-beck.git

ext4 crypto: set up encryption info for new inodes in ext4_inherit_context()

Set up the encryption information for newly created inodes immediately
after they inherit their encryption context from their parent
directories.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/crypto_policy.c b/fs/ext4/crypto_policy.c
index 683391f790d6..81980a158dc7 100644
--- a/fs/ext4/crypto_policy.c
+++ b/fs/ext4/crypto_policy.c
@@ -206,6 +206,7 @@ int ext4_inherit_context(struct inode *parent, struct inode *child)
 	if (!res) {
 		ext4_set_inode_flag(child, EXT4_INODE_ENCRYPT);
 		ext4_clear_inode_state(child, EXT4_STATE_MAY_INLINE_DATA);
+		res = ext4_get_encryption_info(child);
 	}
 	return res;
 }