fscrypt: track master key presence separately from secret

[linux-2.6-microblaze.git] / fs / crypto / hooks.c

diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c
index 85d2975..52504dd 100644 (file)
--- a/fs/crypto/hooks.c
+++ b/fs/crypto/hooks.c
@@ -187,7 +187,7 @@ int fscrypt_prepare_setflags(struct inode *inode,
                        return -EINVAL;
                mk = ci->ci_master_key;
                down_read(&mk->mk_sem);
-               if (is_master_key_secret_present(&mk->mk_secret))
+               if (mk->mk_present)
                        err = fscrypt_derive_dirhash_key(ci, mk);
                else
                        err = -ENOKEY;