Message ID | 1639321683-22909-12-git-send-email-jsimmons@infradead.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | lustre: backport OpenSFS work Dec 12, 2021 | expand |
diff --git a/fs/lustre/llite/file.c b/fs/lustre/llite/file.c index d3374232..898db80 100644 --- a/fs/lustre/llite/file.c +++ b/fs/lustre/llite/file.c @@ -3598,6 +3598,9 @@ static long ll_file_unlock_lease(struct file *file, struct ll_ioc_lease *ioc, if (ioc->lil_count != 1) return -EINVAL; + if (IS_ENCRYPTED(inode)) + return -EOPNOTSUPP; + arg += sizeof(*ioc); if (copy_from_user(¶m.pa_archive_id, (void __user *)arg, sizeof(u32))) { diff --git a/fs/lustre/llite/pcc.c b/fs/lustre/llite/pcc.c index 8430fff..85114b8 100644 --- a/fs/lustre/llite/pcc.c +++ b/fs/lustre/llite/pcc.c @@ -1472,6 +1472,9 @@ int pcc_file_open(struct inode *inode, struct file *file) if (!S_ISREG(inode->i_mode)) return 0; + if (IS_ENCRYPTED(inode)) + return 0; + pcc_inode_lock(inode); pcci = ll_i2pcci(inode);