diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-12-03 05:20:37 +0300 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2020-12-03 05:25:01 +0300 |
| commit | ec0caa974cd092549ab282deb8ec7ea73b36eba0 (patch) | |
| tree | 9609384a2e6542df8862a9f2d903e62dbc4e10c8 /fs/ubifs | |
| parent | 91d0d89241b4201d612bfac623199c84363286e9 (diff) | |
| download | linux-ec0caa974cd092549ab282deb8ec7ea73b36eba0.tar.xz | |
fscrypt: introduce fscrypt_prepare_readdir()
The last remaining use of fscrypt_get_encryption_info() from filesystems
is for readdir (->iterate_shared()). Every other call is now in
fs/crypto/ as part of some other higher-level operation.
We need to add a new argument to fscrypt_get_encryption_info() to
indicate whether the encryption policy is allowed to be unrecognized or
not. Doing this is easier if we can work with high-level operations
rather than direct filesystem use of fscrypt_get_encryption_info().
So add a function fscrypt_prepare_readdir() which wraps the call to
fscrypt_get_encryption_info() for the readdir use case.
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20201203022041.230976-6-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 009fbf844d3e..1f33a5598b93 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -514,7 +514,7 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx) return 0; if (encrypted) { - err = fscrypt_get_encryption_info(dir); + err = fscrypt_prepare_readdir(dir); if (err) return err; |