[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230816050803.15660-7-krisman@suse.de>
Date: Wed, 16 Aug 2023 01:08:00 -0400
From: Gabriel Krisman Bertazi <krisman@...e.de>
To: viro@...iv.linux.org.uk, brauner@...nel.org, tytso@....edu,
ebiggers@...nel.org, jaegeuk@...nel.org
Cc: linux-fsdevel@...r.kernel.org, linux-ext4@...r.kernel.org,
linux-f2fs-devel@...ts.sourceforge.net,
Gabriel Krisman Bertazi <krisman@...e.de>,
Gabriel Krisman Bertazi <krisman@...labora.com>
Subject: [PATCH v6 6/9] libfs: Chain encryption checks after case-insensitive revalidation
From: Gabriel Krisman Bertazi <krisman@...labora.com>
Support encrypted dentries in generic_ci_d_revalidate by chaining
fscrypt_d_revalidate at the tail of the d_revalidate. This allows
filesystem to just call generic_ci_d_revalidate and let it handle any
case-insensitive dentry (encrypted or not).
Signed-off-by: Gabriel Krisman Bertazi <krisman@...labora.com>
---
Changes since v2:
- Enable negative dentries of encrypted filesystems (Eric)
---
fs/libfs.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/fs/libfs.c b/fs/libfs.c
index 26bf1b832b0a..994e4c98ec07 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -1462,9 +1462,8 @@ static int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)
return 0;
}
-static int generic_ci_d_revalidate(struct dentry *dentry,
- const struct qstr *name,
- unsigned int flags)
+static int ci_d_revalidate(struct dentry *dentry, const struct qstr *name,
+ unsigned int flags)
{
const struct dentry *parent;
const struct inode *dir;
@@ -1515,6 +1514,15 @@ static int generic_ci_d_revalidate(struct dentry *dentry,
return 1;
}
+static int generic_ci_d_revalidate(struct dentry *dentry,
+ const struct qstr *name,
+ unsigned int flags)
+{
+ if (!ci_d_revalidate(dentry, name, flags))
+ return 0;
+ return fscrypt_d_revalidate(dentry, name, flags);
+}
+
static const struct dentry_operations generic_ci_dentry_ops = {
.d_hash = generic_ci_d_hash,
.d_compare = generic_ci_d_compare,
@@ -1532,7 +1540,7 @@ static const struct dentry_operations generic_encrypted_dentry_ops = {
static const struct dentry_operations generic_encrypted_ci_dentry_ops = {
.d_hash = generic_ci_d_hash,
.d_compare = generic_ci_d_compare,
- .d_revalidate = fscrypt_d_revalidate,
+ .d_revalidate = generic_ci_d_revalidate,
};
#endif
--
2.41.0
Powered by blists - more mailing lists