diff options
| author | Richard Weinberger <richard@nod.at> | 2019-05-14 21:10:49 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2019-05-15 21:56:48 +0200 |
| commit | 76aa349441729d889ba6f1d58e3369d178250ffd (patch) | |
| tree | bb7d5f4cb1d4f7abfb350f1af105cdc50c591e69 /fs/ubifs | |
| parent | ubifs: Fix build error without CONFIG_UBIFS_FS_XATTR (diff) | |
| download | linux-76aa349441729d889ba6f1d58e3369d178250ffd.tar.xz linux-76aa349441729d889ba6f1d58e3369d178250ffd.zip | |
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 <ebiggers@kernel.org>
Fixes: eea2c05d927b ("ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION")
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/sb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 2afc8b1d4c3b..3ca41965db6e 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c) 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" " was built without crypto support."); err = -EINVAL; @@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c) int err; struct ubifs_sb_node *sup = c->sup_node; - if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION)) + if (!IS_ENABLED(CONFIG_FS_ENCRYPTION)) return -EOPNOTSUPP; if (c->encrypted) |