提交 76aa3494 编写于 作者: R Richard Weinberger

ubifs: Use correct config name for encryption

CONFIG_UBIFS_FS_ENCRYPTION is gone, fscrypt is now
controlled via CONFIG_FS_ENCRYPTION.
This problem slipped into the tree because of a mis-merge on
my side.
Reported-by: NEric Biggers <ebiggers@kernel.org>
Fixes: eea2c05d ("ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION")
Signed-off-by: NRichard Weinberger <richard@nod.at>
上级 481a9b80
...@@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c) ...@@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c)
goto out; goto out;
} }
if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) && c->encrypted) { if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) && c->encrypted) {
ubifs_err(c, "file system contains encrypted files but UBIFS" ubifs_err(c, "file system contains encrypted files but UBIFS"
" was built without crypto support."); " was built without crypto support.");
err = -EINVAL; err = -EINVAL;
...@@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c) ...@@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c)
int err; int err;
struct ubifs_sb_node *sup = c->sup_node; struct ubifs_sb_node *sup = c->sup_node;
if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION)) if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (c->encrypted) if (c->encrypted)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册