Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[platform/kernel/linux-starfive.git] / fs / ext4 / ioctl.c

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index d0b00fa..bfc1281 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -1198,6 +1198,11 @@ resizefs_out:
                        return -EOPNOTSUPP;
                return fscrypt_ioctl_get_key_status(filp, (void __user *)arg);
 
+       case FS_IOC_GET_ENCRYPTION_NONCE:
+               if (!ext4_has_feature_encrypt(sb))
+                       return -EOPNOTSUPP;
+               return fscrypt_ioctl_get_nonce(filp, (void __user *)arg);
+
        case EXT4_IOC_CLEAR_ES_CACHE:
        {
                if (!inode_owner_or_capable(inode))
@@ -1358,6 +1363,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case FS_IOC_REMOVE_ENCRYPTION_KEY:
        case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS:
        case FS_IOC_GET_ENCRYPTION_KEY_STATUS:
+       case FS_IOC_GET_ENCRYPTION_NONCE:
        case EXT4_IOC_SHUTDOWN:
        case FS_IOC_GETFSMAP:
        case FS_IOC_ENABLE_VERITY: