sata_via: fix resource-managed iomap conversion

[powerpc.git] / fs / ecryptfs / file.c

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 779c347..bd969ad 100644 (file)
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1997-2004 Erez Zadok
  * Copyright (C) 2001-2004 Stony Brook University
- * Copyright (C) 2004-2006 International Business Machines Corp.
+ * Copyright (C) 2004-2007 International Business Machines Corp.
  *   Author(s): Michael A. Halcrow <mhalcrow@us.ibm.com>
  *             Michael C. Thompson <mcthomps@us.ibm.com>
  *
@@ -250,6 +250,17 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
        struct ecryptfs_file_info *file_info;
        int lower_flags;
 
+       mount_crypt_stat = &ecryptfs_superblock_to_private(
+               ecryptfs_dentry->d_sb)->mount_crypt_stat;
+       if ((mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
+           && ((file->f_flags & O_WRONLY) || (file->f_flags & O_RDWR)
+               || (file->f_flags & O_CREAT) || (file->f_flags & O_TRUNC)
+               || (file->f_flags & O_APPEND))) {
+               printk(KERN_WARNING "Mount has encrypted view enabled; "
+                      "files may only be read\n");
+               rc = -EPERM;
+               goto out;
+       }
        /* Released in ecryptfs_release or end of function if failure */
        file_info = kmem_cache_zalloc(ecryptfs_file_info_cache, GFP_KERNEL);
        ecryptfs_set_file_private(file, file_info);
@@ -261,14 +272,12 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
        }
        lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry);
        crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
-       mount_crypt_stat = &ecryptfs_superblock_to_private(
-               ecryptfs_dentry->d_sb)->mount_crypt_stat;
        mutex_lock(&crypt_stat->cs_mutex);
-       if (!ECRYPTFS_CHECK_FLAG(crypt_stat->flags, ECRYPTFS_POLICY_APPLIED)) {
+       if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)) {
                ecryptfs_printk(KERN_DEBUG, "Setting flags for stat...\n");
                /* Policy code enabled in future release */
-               ECRYPTFS_SET_FLAG(crypt_stat->flags, ECRYPTFS_POLICY_APPLIED);
-               ECRYPTFS_SET_FLAG(crypt_stat->flags, ECRYPTFS_ENCRYPTED);
+               crypt_stat->flags |= ECRYPTFS_POLICY_APPLIED;
+               crypt_stat->flags |= ECRYPTFS_ENCRYPTED;
        }
        mutex_unlock(&crypt_stat->cs_mutex);
        lower_flags = file->f_flags;
@@ -288,31 +297,14 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
        lower_inode = lower_dentry->d_inode;
        if (S_ISDIR(ecryptfs_dentry->d_inode->i_mode)) {
                ecryptfs_printk(KERN_DEBUG, "This is a directory\n");
-               ECRYPTFS_CLEAR_FLAG(crypt_stat->flags, ECRYPTFS_ENCRYPTED);
+               crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
                rc = 0;
                goto out;
        }
        mutex_lock(&crypt_stat->cs_mutex);
-       if (i_size_read(lower_inode) < ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE) {
-               if (!(mount_crypt_stat->flags
-                     & ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED)) {
-                       rc = -EIO;
-                       printk(KERN_WARNING "Attempt to read file that is "
-                              "not in a valid eCryptfs format, and plaintext "
-                              "passthrough mode is not enabled; returning "
-                              "-EIO\n");
-                       mutex_unlock(&crypt_stat->cs_mutex);
-                       goto out_puts;
-               }
-               crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-               rc = 0;
-               mutex_unlock(&crypt_stat->cs_mutex);
-               goto out;
-       } else if (!ECRYPTFS_CHECK_FLAG(crypt_stat->flags,
-                                       ECRYPTFS_POLICY_APPLIED)
-                  || !ECRYPTFS_CHECK_FLAG(crypt_stat->flags,
-                                          ECRYPTFS_KEY_VALID)) {
-               rc = ecryptfs_read_headers(ecryptfs_dentry, lower_file);
+       if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
+           || !(crypt_stat->flags & ECRYPTFS_KEY_VALID)) {
+               rc = ecryptfs_read_metadata(ecryptfs_dentry, lower_file);
                if (rc) {
                        ecryptfs_printk(KERN_DEBUG,
                                        "Valid headers not found\n");
@@ -326,9 +318,8 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
                                mutex_unlock(&crypt_stat->cs_mutex);
                                goto out_puts;
                        }
-                       ECRYPTFS_CLEAR_FLAG(crypt_stat->flags,
-                                           ECRYPTFS_ENCRYPTED);
                        rc = 0;
+                       crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
                        mutex_unlock(&crypt_stat->cs_mutex);
                        goto out;
                }