diff options
| author |   Eric Biggers <ebiggers@google.com> | 2018-01-11 23:30:08 -0500 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2018-01-11 23:30:08 -0500 |
| commit | 1e80ad712f69a34d1e3c556d1d674d04b266ad40 (patch) | |
| tree | ec11aea0ae8d7b6d236a6ea233c8d9717451a66a /fs/crypto | |
| parent | ubifs: switch to fscrypt_get_symlink() (diff) | |
| download | linux-dev-1e80ad712f69a34d1e3c556d1d674d04b266ad40.tar.xz linux-dev-1e80ad712f69a34d1e3c556d1d674d04b266ad40.zip | |
fscrypt: remove fscrypt_fname_usr_to_disk()
fscrypt_fname_usr_to_disk() sounded very generic but was actually only
used to encrypt symlinks. Remove it now that all filesystems have been
switched over to fscrypt_encrypt_symlink().
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/fname.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 62f13d533439..cae7d1bcc8c5 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -312,35 +312,6 @@ int fscrypt_fname_disk_to_usr(struct inode *inode, EXPORT_SYMBOL(fscrypt_fname_disk_to_usr); /** - * fscrypt_fname_usr_to_disk() - converts a filename from user space to disk - * space - * - * The caller must have allocated sufficient memory for the @oname string. - * - * Return: 0 on success, -errno on failure - */ -int fscrypt_fname_usr_to_disk(struct inode *inode, - const struct qstr *iname, - struct fscrypt_str *oname) -{ - if (fscrypt_is_dot_dotdot(iname)) { - oname->name[0] = '.'; - oname->name[iname->len - 1] = '.'; - oname->len = iname->len; - return 0; - } - if (inode->i_crypt_info) - return fname_encrypt(inode, iname, oname); - /* - * Without a proper key, a user is not allowed to modify the filenames - * in a directory. Consequently, a user space name cannot be mapped to - * a disk-space name - */ - return -ENOKEY; -} -EXPORT_SYMBOL(fscrypt_fname_usr_to_disk); - -/** * fscrypt_setup_filename() - prepare to search a possibly encrypted directory * @dir: the directory that will be searched * @iname: the user-provided filename being searched for |