The patch titled
     eCryptfs: remove unnecessary BUG_ON
has been removed from the -mm tree.  Its filename was
     ecryptfs-remove-unnecessary-bug_on.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: eCryptfs: remove unnecessary BUG_ON
From: Michael Halcrow <[EMAIL PROTECTED]>

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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 fs/ecryptfs/crypto.c |    3 ---
 1 file changed, 3 deletions(-)

diff -puN fs/ecryptfs/crypto.c~ecryptfs-remove-unnecessary-bug_on 
fs/ecryptfs/crypto.c
--- a/fs/ecryptfs/crypto.c~ecryptfs-remove-unnecessary-bug_on
+++ a/fs/ecryptfs/crypto.c
@@ -1029,9 +1029,6 @@ int ecryptfs_new_file_context(struct den
        int rc = 0;
 
        ecryptfs_set_default_crypt_stat_vals(crypt_stat, mount_crypt_stat);
-       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);
        crypt_stat->flags |= ECRYPTFS_ENCRYPTED;
        crypt_stat->flags |= ECRYPTFS_KEY_VALID;
        ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat,
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-unionfs.patch
ecryptfs-allow-lower-fs-to-interpret-attr_kill_sid.patch
vfs-make-notify_change-pass-attr_kill_sid-to-setattr-operations.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to