Skip to content

Commit 76aa349

Browse files
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: Eric Biggers <[email protected]> Fixes: eea2c05 ("ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION") Signed-off-by: Richard Weinberger <[email protected]>
1 parent 481a9b8 commit 76aa349

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/ubifs/sb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c)
748748
goto out;
749749
}
750750

751-
if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) && c->encrypted) {
751+
if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) && c->encrypted) {
752752
ubifs_err(c, "file system contains encrypted files but UBIFS"
753753
" was built without crypto support.");
754754
err = -EINVAL;
@@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c)
941941
int err;
942942
struct ubifs_sb_node *sup = c->sup_node;
943943

944-
if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION))
944+
if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
945945
return -EOPNOTSUPP;
946946

947947
if (c->encrypted)

0 commit comments

Comments
 (0)