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

Commit af655dc6 authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

eCryptfs: collapse flag set into one statement 



Andrew Morton wrote:
> > +     crypt_stat->flags |= ECRYPTFS_ENCRYPTED;
> > +     crypt_stat->flags |= ECRYPTFS_KEY_VALID;
>
> Maybe the compiler can optimise those two statements, but we'd
> normally provide it with some manual help.

This patch provides the compiler with some manual help for
optimizing the setting of some flags.

Signed-off-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c59c2eb5

fs/ecryptfs/crypto.c

+1 −2
Original line number Diff line number Diff line
@@ -1029,8 +1029,7 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry) 
	int rc = 0;



	ecryptfs_set_default_crypt_stat_vals(crypt_stat, mount_crypt_stat);

	crypt_stat->flags |= ECRYPTFS_ENCRYPTED;

	crypt_stat->flags |= ECRYPTFS_KEY_VALID;

	crypt_stat->flags |= (ECRYPTFS_ENCRYPTED | ECRYPTFS_KEY_VALID);

	ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat,

						      mount_crypt_stat);

	rc = ecryptfs_copy_mount_wide_sigs_to_inode_sigs(crypt_stat,