Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[mv-sheeva.git] / fs / ecryptfs / read_write.c

diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
index e59c94add127d66502c78e47e86aee894758ae90..2150edf9a58e6db662adcb12bb9ae279ad306c2d 100644 (file)
--- a/fs/ecryptfs/read_write.c
+++ b/fs/ecryptfs/read_write.c
@@ -87,7 +87,8 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,
        loff_t offset;
        int rc;
 
-       offset = (page_for_lower->index << PAGE_CACHE_SHIFT) + offset_in_page;
+       offset = ((((off_t)page_for_lower->index) << PAGE_CACHE_SHIFT)
+                 + offset_in_page);
        virt = kmap(page_for_lower);
        rc = ecryptfs_write_lower(ecryptfs_inode, virt, offset, size);
        kunmap(page_for_lower);
@@ -117,7 +118,8 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,
 {
        struct page *ecryptfs_page;
        char *ecryptfs_page_virt;
-       u64 ecryptfs_file_size = i_size_read(ecryptfs_file->f_dentry->d_inode);
+       loff_t ecryptfs_file_size =
+               i_size_read(ecryptfs_file->f_dentry->d_inode);
        loff_t data_offset = 0;
        loff_t pos;
        int rc = 0;
@@ -140,8 +142,8 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,
                        if (num_bytes > total_remaining_zeros)
                                num_bytes = total_remaining_zeros;
                }
-               ecryptfs_page = ecryptfs_get1page(ecryptfs_file,
-                                                 ecryptfs_page_idx);
+               ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_file,
+                                                        ecryptfs_page_idx);
                if (IS_ERR(ecryptfs_page)) {
                        rc = PTR_ERR(ecryptfs_page);
                        printk(KERN_ERR "%s: Error getting page at "
@@ -154,11 +156,12 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,
                        /* Read in the page from the lower
                         * into the eCryptfs inode page cache,
                         * decrypting */
-                       if ((rc = ecryptfs_decrypt_page(NULL, /* placeholder for git-bisect */
-                                                       ecryptfs_page))) {
+                       rc = ecryptfs_decrypt_page(ecryptfs_page);
+                       if (rc) {
                                printk(KERN_ERR "%s: Error decrypting "
                                       "page; rc = [%d]\n",
                                       __FUNCTION__, rc);
+                               ClearPageUptodate(ecryptfs_page);
                                page_cache_release(ecryptfs_page);
                                goto out;
                        }
@@ -178,20 +181,21 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,
                }
                kunmap_atomic(ecryptfs_page_virt, KM_USER0);
                flush_dcache_page(ecryptfs_page);
-               rc = ecryptfs_encrypt_page(NULL /* placeholder for git-bisect */);
+               SetPageUptodate(ecryptfs_page);
+               unlock_page(ecryptfs_page);
+               rc = ecryptfs_encrypt_page(ecryptfs_page);
+               page_cache_release(ecryptfs_page);
                if (rc) {
                        printk(KERN_ERR "%s: Error encrypting "
                               "page; rc = [%d]\n", __FUNCTION__, rc);
-                       page_cache_release(ecryptfs_page);
                        goto out;
                }
-               page_cache_release(ecryptfs_page);
                pos += num_bytes;
        }
        if ((offset + size) > ecryptfs_file_size) {
                i_size_write(ecryptfs_file->f_dentry->d_inode, (offset + size));
-               rc = ecryptfs_write_inode_size_to_metadata(NULL, NULL, NULL,
-                                                          NULL, 0); /* placeholders for git-bisect */
+               rc = ecryptfs_write_inode_size_to_metadata(
+                       ecryptfs_file->f_dentry->d_inode);
                if (rc) {
                        printk(KERN_ERR "Problem with "
                               "ecryptfs_write_inode_size_to_metadata; "
@@ -223,7 +227,6 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
                ecryptfs_inode_to_private(ecryptfs_inode);
        ssize_t octets_read;
        mm_segment_t fs_save;
-       size_t i;
        int rc = 0;
 
        mutex_lock(&inode_info->lower_file_mutex);
@@ -240,16 +243,6 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
                rc = -EINVAL;
        }
        mutex_unlock(&inode_info->lower_file_mutex);
-       for (i = 0; i < size; i += PAGE_CACHE_SIZE) {
-               struct page *data_page;
-
-               data_page = virt_to_page(data + i);
-               flush_dcache_page(data_page);
-               if (rc)
-                       ClearPageUptodate(data_page);
-               else
-                       SetPageUptodate(data_page);
-       }
        return rc;
 }
 
@@ -277,10 +270,11 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,
        loff_t offset;
        int rc;
 
-       offset = ((page_index << PAGE_CACHE_SHIFT) + offset_in_page);
+       offset = ((((loff_t)page_index) << PAGE_CACHE_SHIFT) + offset_in_page);
        virt = kmap(page_for_ecryptfs);
        rc = ecryptfs_read_lower(virt, offset, size, ecryptfs_inode);
        kunmap(page_for_ecryptfs);
+       flush_dcache_page(page_for_ecryptfs);
        return rc;
 }
 
@@ -306,7 +300,8 @@ int ecryptfs_read(char *data, loff_t offset, size_t size,
 {
        struct page *ecryptfs_page;
        char *ecryptfs_page_virt;
-       u64 ecryptfs_file_size = i_size_read(ecryptfs_file->f_dentry->d_inode);
+       loff_t ecryptfs_file_size =
+               i_size_read(ecryptfs_file->f_dentry->d_inode);
        loff_t data_offset = 0;
        loff_t pos;
        int rc = 0;
@@ -328,8 +323,8 @@ int ecryptfs_read(char *data, loff_t offset, size_t size,
 
                if (num_bytes > total_remaining_bytes)
                        num_bytes = total_remaining_bytes;
-               ecryptfs_page = ecryptfs_get1page(ecryptfs_file,
-                                                 ecryptfs_page_idx);
+               ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_file,
+                                                        ecryptfs_page_idx);
                if (IS_ERR(ecryptfs_page)) {
                        rc = PTR_ERR(ecryptfs_page);
                        printk(KERN_ERR "%s: Error getting page at "
@@ -338,10 +333,11 @@ int ecryptfs_read(char *data, loff_t offset, size_t size,
                               ecryptfs_page_idx, rc);
                        goto out;
                }
-               rc = ecryptfs_decrypt_page(NULL /* placeholder for git-bisect */, ecryptfs_page);
+               rc = ecryptfs_decrypt_page(ecryptfs_page);
                if (rc) {
                        printk(KERN_ERR "%s: Error decrypting "
                               "page; rc = [%d]\n", __FUNCTION__, rc);
+                       ClearPageUptodate(ecryptfs_page);
                        page_cache_release(ecryptfs_page);
                        goto out;
                }
@@ -350,6 +346,9 @@ int ecryptfs_read(char *data, loff_t offset, size_t size,
                       ((char *)ecryptfs_page_virt + start_offset_in_page),
                       num_bytes);
                kunmap_atomic(ecryptfs_page_virt, KM_USER0);
+               flush_dcache_page(ecryptfs_page);
+               SetPageUptodate(ecryptfs_page);
+               unlock_page(ecryptfs_page);
                page_cache_release(ecryptfs_page);
                pos += num_bytes;
                data_offset += num_bytes;