mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-26 08:31:13 +00:00
eCryptfs: Remove ecryptfs_unlink_sigs warnings
A feature was added to the eCryptfs umount helper to automatically unlink the keys used for an eCryptfs mount from the kernel keyring upon umount. This patch keeps the unrecognized mount option warnings for ecryptfs_unlink_sigs out of the logs. Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
This commit is contained in:
parent
13a791b4e6
commit
e77cc8d243
3 changed files with 8 additions and 1 deletions
|
@ -208,7 +208,7 @@ enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig,
|
|||
ecryptfs_opt_passthrough, ecryptfs_opt_xattr_metadata,
|
||||
ecryptfs_opt_encrypted_view, ecryptfs_opt_fnek_sig,
|
||||
ecryptfs_opt_fn_cipher, ecryptfs_opt_fn_cipher_key_bytes,
|
||||
ecryptfs_opt_err };
|
||||
ecryptfs_opt_unlink_sigs, ecryptfs_opt_err };
|
||||
|
||||
static const match_table_t tokens = {
|
||||
{ecryptfs_opt_sig, "sig=%s"},
|
||||
|
@ -222,6 +222,7 @@ static const match_table_t tokens = {
|
|||
{ecryptfs_opt_fnek_sig, "ecryptfs_fnek_sig=%s"},
|
||||
{ecryptfs_opt_fn_cipher, "ecryptfs_fn_cipher=%s"},
|
||||
{ecryptfs_opt_fn_cipher_key_bytes, "ecryptfs_fn_key_bytes=%u"},
|
||||
{ecryptfs_opt_unlink_sigs, "ecryptfs_unlink_sigs"},
|
||||
{ecryptfs_opt_err, NULL}
|
||||
};
|
||||
|
||||
|
@ -402,6 +403,9 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options)
|
|||
fn_cipher_key_bytes;
|
||||
fn_cipher_key_bytes_set = 1;
|
||||
break;
|
||||
case ecryptfs_opt_unlink_sigs:
|
||||
mount_crypt_stat->flags |= ECRYPTFS_UNLINK_SIGS;
|
||||
break;
|
||||
case ecryptfs_opt_err:
|
||||
default:
|
||||
printk(KERN_WARNING
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue