aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-10-16 04:28:00 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:11 -0400
commitc59c2eb53f002de96f48dbc51e4f3bd946cf2458 (patch)
treeaf9c826e357e1edd2c8f3410b98833141a154365
parent81acbcd6c54c89a9eb09c1b9ca3bd952f6989c10 (diff)
eCryptfs: remove unnecessary BUG_ON
Andrew Morton wrote: > > + mutex_lock(&mount_crypt_stat->global_auth_tok_list_mutex); > > + BUG_ON(mount_crypt_stat->num_global_auth_toks == 0); > > + mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex); > > That's odd-looking. If it was a bug for num_global_auth_toks to be > zero, and if that mutex protects num_global_auth_toks then as soon > as the lock gets dropped, another thread can make > num_global_auth_toks zero, hence the bug is present. Perhaps? That was serving as an internal sanity check that should not have made it into the final patch set in the first place. This patch removes it. 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>
-rw-r--r--fs/ecryptfs/crypto.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 129ed13f8253..14cc1f57e7b0 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1029,9 +1029,6 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry)
1029 int rc = 0; 1029 int rc = 0;
1030 1030
1031 ecryptfs_set_default_crypt_stat_vals(crypt_stat, mount_crypt_stat); 1031 ecryptfs_set_default_crypt_stat_vals(crypt_stat, mount_crypt_stat);
1032 mutex_lock(&mount_crypt_stat->global_auth_tok_list_mutex);
1033 BUG_ON(mount_crypt_stat->num_global_auth_toks == 0);
1034 mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex);
1035 crypt_stat->flags |= ECRYPTFS_ENCRYPTED; 1032 crypt_stat->flags |= ECRYPTFS_ENCRYPTED;
1036 crypt_stat->flags |= ECRYPTFS_KEY_VALID; 1033 crypt_stat->flags |= ECRYPTFS_KEY_VALID;
1037 ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat, 1034 ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat,