fscrypt: rename fscrypt_master_key to fscrypt_direct_key
authorEric Biggers <ebiggers@google.com>
Mon, 5 Aug 2019 02:35:45 +0000 (19:35 -0700)
committerEric Biggers <ebiggers@google.com>
Tue, 13 Aug 2019 02:05:27 +0000 (19:05 -0700)
commita828daabb2ae917c12f4dc617c04db1185e6221f
tree224615d1caf8f14c576d723aa5474b8001e3d5af
parent59dc6a8e1f534cde6f7986f2fd278062e25336c0
fscrypt: rename fscrypt_master_key to fscrypt_direct_key

In preparation for introducing a filesystem-level keyring which will
contain fscrypt master keys, rename the existing 'struct
fscrypt_master_key' to 'struct fscrypt_direct_key'.  This is the
structure in the existing table of master keys that's maintained to
deduplicate the crypto transforms for v1 DIRECT_KEY policies.

I've chosen to keep this table as-is rather than make it automagically
add/remove the keys to/from the filesystem-level keyring, since that
would add a lot of extra complexity to the filesystem-level keyring.

Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eric Biggers <ebiggers@google.com>
fs/crypto/fscrypt_private.h
fs/crypto/keyinfo.c