Merge commit 'gcl/gcl-next'

[linux-2.6-block.git] / fs / ecryptfs / file.c

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 2c2d60df3f607e99abc81d3caf1579794f32e5e3..9244d653743ec02c6d279071095f76c08c834dd6 100644 (file)
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -200,10 +200,6 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
                goto out;
        }
        if (!ecryptfs_inode_to_private(inode)->lower_file) {
-               BUG_ON(!(crypt_stat->flags & ECRYPTFS_DELAY_PERSISTENT));
-               mutex_lock(&crypt_stat->cs_mutex);
-               crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-               mutex_unlock(&crypt_stat->cs_mutex);
                rc = ecryptfs_init_persistent_file(ecryptfs_dentry);
                if (rc) {
                        printk(KERN_ERR "%s: Error attempting to initialize "