diff options
| author | Michael Halcrow | 2007-10-16 10:28:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-16 18:43:11 +0200 |
| commit | af655dc6a9d5028d89aa35b65781631451aadc19 (patch) | |
| tree | aab30213366f9077b44fc09387a61bb140ca8240 /fs/ecryptfs | |
| parent | eCryptfs: remove unnecessary BUG_ON (diff) | |
| download | kernel-qcow2-linux-af655dc6a9d5028d89aa35b65781631451aadc19.tar.gz kernel-qcow2-linux-af655dc6a9d5028d89aa35b65781631451aadc19.tar.xz kernel-qcow2-linux-af655dc6a9d5028d89aa35b65781631451aadc19.zip | |
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: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs')
| -rw-r--r-- | fs/ecryptfs/crypto.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 14cc1f57e7b0..76bba7384d51 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -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, |