The patch titled
ecryptfs: Remove extraneous read of inode size from header
has been removed from the -mm tree. Its filename is
ecryptfs-file-operations-remove-extraneous-read-of-inode-size-from-header.patch
This patch was dropped because it was folded into ecryptfs-file-operations.patch
------------------------------------------------------
Subject: ecryptfs: Remove extraneous read of inode size from header
From: Mike Halcrow <mhalcrow@xxxxxxxxxx>
Christoph Hellwig pointed out that the inode is not live at this point
in ecryptfs_open(), and so this entire function is pointless.
Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/file.c | 47 -------------------------------------------
1 files changed, 1 insertion(+), 46 deletions(-)
diff -puN fs/ecryptfs/file.c~ecryptfs-file-operations-remove-extraneous-read-of-inode-size-from-header fs/ecryptfs/file.c
--- 25/fs/ecryptfs/file.c~ecryptfs-file-operations-remove-extraneous-read-of-inode-size-from-header Fri May 26 13:48:03 2006
+++ 25-akpm/fs/ecryptfs/file.c Fri May 26 13:48:03 2006
@@ -189,49 +189,6 @@ retry:
return rc;
}
-/**
- * read_inode_size_from_header
- * @lower_file: The lower file struct
- * @lower_inode: The lower inode
- * @inode: The ecryptfs inode
- *
- * Returns zero on success; non-zero otherwise
- */
-static int
-read_inode_size_from_header(struct file *lower_file,
- struct inode *lower_inode, struct inode *inode)
-{
- int rc;
- struct page *header_page;
- unsigned char *header_virt;
- u64 data_size;
-
- header_page = grab_cache_page(lower_inode->i_mapping, 0);
- if (!header_page) {
- rc = -EINVAL;
- ecryptfs_printk(KERN_ERR, "grab_cache_page for header page "
- "failed\n");
- goto out;
- }
- header_virt = kmap(header_page);
- rc = lower_inode->i_mapping->a_ops->readpage(lower_file, header_page);
- if (rc) {
- ecryptfs_printk(KERN_ERR, "Error reading header page\n");
- goto out_unmap;
- }
- memcpy(&data_size, header_virt, sizeof(data_size));
- data_size = be64_to_cpu(data_size);
- i_size_write(inode, (loff_t)data_size);
- ecryptfs_printk(KERN_DEBUG, "inode w/ addr = [0x%p], i_ino = [0x%.16x] "
- "size: [0x%.16x]\n", inode, inode->i_ino,
- i_size_read(inode));
-out_unmap:
- kunmap(header_page);
- page_cache_release(header_page);
-out:
- return rc;
-}
-
struct kmem_cache *ecryptfs_file_info_cache;
/**
@@ -320,9 +277,7 @@ static int ecryptfs_open(struct inode *i
* going to default to -EIO. */
rc = -EIO;
goto out_puts;
- } else
- read_inode_size_from_header(lower_file, lower_inode,
- inode);
+ }
}
ecryptfs_printk(KERN_DEBUG, "inode w/ addr = [0x%p], i_ino = [0x%.16x] "
"size: [0x%.16x]\n", inode, inode->i_ino,
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
ecryptfs-fs-makefile-and-fs-kconfig.patch
ecryptfs-documentation.patch
ecryptfs-makefile.patch
ecryptfs-main-module-functions.patch
ecryptfs-header-declarations.patch
ecryptfs-superblock-operations.patch
ecryptfs-dentry-operations.patch
ecryptfs-file-operations.patch
ecryptfs-file-operations-remove-extraneous-read-of-inode-size-from-header.patch
ecryptfs-file-operations-fix.patch
ecryptfs-file-operations-fix-premature-release-of-file_info-memory.patch
ecryptfs-inode-operations.patch
ecryptfs-mmap-operations.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-keystore.patch
ecryptfs-crypto-functions.patch
ecryptfs-crypto-functions-fix-filesize-on-hard-link-creation.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-debug-functions.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-convert-assert-to-bug_on.patch
ecryptfs-remove-pointless-bug_ons.patch
ecryptfs-remove-unnecessary-null-checks.patch
ecryptfs-rewrite-ecryptfs_fsync.patch
ecryptfs-overhaul-file-locking.patch
ecryptfs-dont-muck-with-the-existing-nameidata-structures.patch
ecryptfs-asm-scatterlisth-linux-scatterlisth.patch
ecryptfs-support-for-larger-maximum-key-size.patch
ecryptfs-add-codes-for-additional-ciphers.patch
ecryptfs-unencrypted-key-size-based-on-encrypted-key-size.patch
ecryptfs-packet-and-key-management-update-for-variable-key-size.patch
ecryptfs-add-ecryptfs_-prefix-to-mount-options-key-size-parameter.patch
ecryptfs-set-the-key-size-from-the-default-for-the-mount.patch
ecryptfs-check-for-weak-keys.patch
ecryptfs-add-define-values-for-cipher-codes-from-rfc2440-openpgp.patch
ecryptfs-convert-bits-to-bytes.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-more-intelligent-use-of-tfm-objects.patch
ecryptfs-remove-debugging-cruft.patch
ecryptfs-get_sb_dev-fix.patch
ecryptfs-validate-minimum-header-extent-size.patch
ecryptfs-validate-body-size.patch
ecryptfs-validate-packet-length-prior-to-parsing-add-comments.patch
ecryptfs-validate-packet-length-prior-to-parsing-add-comments-fix.patch
ecryptfs-use-the-passed-in-max-value-as-the-upper-bound.patch
ecryptfs-change-the-maximum-size-check-when-writing-header.patch
ecryptfs-print-the-actual-option-that-is-problematic.patch
ecryptfs-add-a-maintainers-entry.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
