aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-08-04 19:35:48 -0700
committerEric Biggers <ebiggers@google.com>2019-08-12 19:18:50 -0700
commit29b3692e6dbf82266ec3c2764c236f8708d7fc89 (patch)
tree984c157afd0e2d1491c7aab26c9e13b8934ea905 /fs/ext4/super.c
parentfscrypt: require that key be added when setting a v2 encryption policy (diff)
downloadlinux-dev-29b3692e6dbf82266ec3c2764c236f8708d7fc89.tar.xz
linux-dev-29b3692e6dbf82266ec3c2764c236f8708d7fc89.zip
ext4: wire up new fscrypt ioctls
Wire up the new ioctls for adding and removing fscrypt keys to/from the filesystem, and the new ioctl for retrieving v2 encryption policies. The key removal ioctls also required making ext4_drop_inode() call fscrypt_drop_inode(). For more details see Documentation/filesystems/fscrypt.rst and the fscrypt patches that added the implementation of these ioctls. Reviewed-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to '')
-rw-r--r--fs/ext4/super.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4079605d437a..757819139b8f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1107,6 +1107,9 @@ static int ext4_drop_inode(struct inode *inode)
{
int drop = generic_drop_inode(inode);
+ if (!drop)
+ drop = fscrypt_drop_inode(inode);
+
trace_ext4_drop_inode(inode, drop);
return drop;
}