Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d9cb0ef authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

fscrypt: fix build with pre-4.6 gcc versions 



gcc versions prior to 4.6 require an extra level of braces when using a
designated initializer for a member in an anonymous struct or union.
This caused a compile error with the 'struct qstr' initialization in
__fscrypt_encrypt_symlink().

Fix it by using QSTR_INIT().

Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Fixes: 76e81d6d5048 ("fscrypt: new helper functions for ->symlink()")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 401052ff

fs/crypto/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int __fscrypt_encrypt_symlink(struct inode *inode, const char *target, 
			      unsigned int len, struct fscrypt_str *disk_link)

{

	int err;

	struct qstr iname = { .name = target, .len = len };

	struct qstr iname = QSTR_INIT(target, len);

	struct fscrypt_symlink_data *sd;

	unsigned int ciphertext_len;