2.6.24

 fs

 ecryptfs

diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index a9d87c4..9cc2aec 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -419,13 +419,15 @@ int ecryptfs_init_messaging(unsigned int transport)
    }
    mutex_init(&ecryptfs_daemon_id_hash_mux);
    mutex_lock(&ecryptfs_daemon_id_hash_mux);
-   ecryptfs_hash_buckets = 0;
-   while (ecryptfs_number_of_users >> ++ecryptfs_hash_buckets);
+   ecryptfs_hash_buckets = 1;
+   while (ecryptfs_number_of_users >> ecryptfs_hash_buckets)
+      ecryptfs_hash_buckets++;
    ecryptfs_daemon_id_hash = kmalloc(sizeof(struct hlist_head)
                  * ecryptfs_hash_buckets, GFP_KERNEL);
    if (!ecryptfs_daemon_id_hash) {
       rc = -ENOMEM;
       ecryptfs_printk(KERN_ERR, "Failed to allocate memory\n");
+      mutex_unlock(&ecryptfs_daemon_id_hash_mux);
       goto out;
    }
    for (i = 0; i < ecryptfs_hash_buckets; i++)