The patch titled
ecryptfs: don't muck with the existing nameidata structures
has been removed from the -mm tree. Its filename is
ecryptfs-dont-muck-with-the-existing-nameidata-structures.patch
This patch was dropped because it was folded into ecryptfs-fs-makefile-and-fs-kconfig.patch
------------------------------------------------------
Subject: ecryptfs: don't muck with the existing nameidata structures
From: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/dentry.c | 18 +++++++-----------
fs/ecryptfs/inode.c | 14 +++++---------
2 files changed, 12 insertions(+), 20 deletions(-)
diff -puN fs/ecryptfs/dentry.c~ecryptfs-dont-muck-with-the-existing-nameidata-structures fs/ecryptfs/dentry.c
--- a/fs/ecryptfs/dentry.c~ecryptfs-dont-muck-with-the-existing-nameidata-structures
+++ a/fs/ecryptfs/dentry.c
@@ -41,23 +41,19 @@
*/
static int ecryptfs_d_revalidate(struct dentry *dentry, struct nameidata *nd)
{
- int err = 1;
+ int rc = 1;
struct dentry *lower_dentry;
- struct dentry *saved_dentry;
- struct vfsmount *saved_vfsmount;
+ struct nameidata lower_nd;
lower_dentry = ecryptfs_dentry_to_lower(dentry);
if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate)
goto out;
- saved_dentry = nd->dentry;
- saved_vfsmount = nd->mnt;
- nd->dentry = lower_dentry;
- nd->mnt = ecryptfs_superblock_to_private(dentry->d_sb)->lower_mnt;
- err = lower_dentry->d_op->d_revalidate(lower_dentry, nd);
- nd->dentry = saved_dentry;
- nd->mnt = saved_vfsmount;
+ memcpy(&lower_nd, nd, sizeof(struct nameidata));
+ lower_nd.dentry = lower_dentry;
+ lower_nd.mnt = ecryptfs_superblock_to_private(dentry->d_sb)->lower_mnt;
+ rc = lower_dentry->d_op->d_revalidate(lower_dentry, &lower_nd);
out:
- return err;
+ return rc;
}
struct kmem_cache *ecryptfs_dentry_info_cache;
diff -puN fs/ecryptfs/inode.c~ecryptfs-dont-muck-with-the-existing-nameidata-structures fs/ecryptfs/inode.c
--- a/fs/ecryptfs/inode.c~ecryptfs-dont-muck-with-the-existing-nameidata-structures
+++ a/fs/ecryptfs/inode.c
@@ -115,17 +115,13 @@ ecryptfs_create_underlying_file(struct i
struct nameidata *nd)
{
int rc;
- struct dentry *saved_dentry = NULL;
- struct vfsmount *saved_vfsmount = NULL;
+ struct nameidata lower_nd;
- saved_dentry = nd->dentry;
- saved_vfsmount = nd->mnt;
- nd->dentry = lower_dentry;
- nd->mnt = ecryptfs_superblock_to_private(
+ memcpy(&lower_nd, nd, sizeof(struct nameidata));
+ lower_nd.dentry = lower_dentry;
+ lower_nd.mnt = ecryptfs_superblock_to_private(
ecryptfs_dentry->d_sb)->lower_mnt;
- rc = vfs_create(lower_dir_inode, lower_dentry, mode, nd);
- nd->dentry = saved_dentry;
- nd->mnt = saved_vfsmount;
+ rc = vfs_create(lower_dir_inode, lower_dentry, mode, &lower_nd);
return rc;
}
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
origin.patch
ecryptfs-fs-makefile-and-fs-kconfig.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-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-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
ecryptfs-partial-signed-integer-to-size_t-conversion-updated-ii.patch
ecryptfs-graceful-handling-of-mount-error.patch
ecryptfs-fix-printk-format-warnings.patch
ecryptfs-associate-vfsmount-with-dentry-rather-than-superblock.patch
ecryptfs-mntput-lower-mount-on-umount_begin.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-ecryptfs.patch
make-kmem_cache_destroy-return-void-ecryptfs.patch
ecryptfs-inode-numbering-fixes.patch
ecryptfs-versioning-fixes.patch
ecryptfs-versioning-fixes-tidy.patch
ecryptfs-grab-lock-on-lower_page-in-ecryptfs_sync_page.patch
ecryptfs-enable-plaintext-passthrough.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
