The patch titled
eCryptfs: Remove ecryptfs_umount_begin
has been added to the -mm tree. Its filename is
ecryptfs-remove-ecryptfs_umount_begin.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: eCryptfs: Remove ecryptfs_umount_begin
From: Michael Halcrow <mhalcrow@xxxxxxxxxx>
There is no point to calling the lower umount_begin when the eCryptfs
umount_begin is called.
Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/super.c | 18 ------------------
1 files changed, 18 deletions(-)
diff -puN fs/ecryptfs/super.c~ecryptfs-remove-ecryptfs_umount_begin fs/ecryptfs/super.c
--- a/fs/ecryptfs/super.c~ecryptfs-remove-ecryptfs_umount_begin
+++ a/fs/ecryptfs/super.c
@@ -138,23 +138,6 @@ static void ecryptfs_clear_inode(struct
}
/**
- * ecryptfs_umount_begin
- *
- * Called in do_umount().
- */
-static void ecryptfs_umount_begin(struct vfsmount *vfsmnt, int flags)
-{
- struct vfsmount *lower_mnt =
- ecryptfs_dentry_to_lower_mnt(vfsmnt->mnt_sb->s_root);
- struct super_block *lower_sb;
-
- mntput(lower_mnt);
- lower_sb = lower_mnt->mnt_sb;
- if (lower_sb->s_op->umount_begin)
- lower_sb->s_op->umount_begin(lower_mnt, flags);
-}
-
-/**
* ecryptfs_show_options
*
* Prints the directory we are currently mounted over.
@@ -193,6 +176,5 @@ struct super_operations ecryptfs_sops =
.statfs = ecryptfs_statfs,
.remount_fs = NULL,
.clear_inode = ecryptfs_clear_inode,
- .umount_begin = ecryptfs_umount_begin,
.show_options = ecryptfs_show_options
};
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
ecryptfs-clean-up-crypto-initialization.patch
ecryptfs-hash-code-to-new-crypto-api.patch
ecryptfs-cipher-code-to-new-crypto-api.patch
ecryptfs-consolidate-lower-dentry_opens.patch
ecryptfs-remove-ecryptfs_umount_begin.patch
ecryptfs-fix-handling-of-lower-d_count.patch
fsstack-introduce-fsstack_copy_attrinode_.patch
fsstack-introduce-fsstack_copy_attrinode_-tidy.patch
ecryptfs-use-fsstacks-generic-copy-inode-attr.patch
ecryptfs-use-fsstacks-generic-copy-inode-attr-tidy-fix.patch
struct-path-make-ecryptfs-a-user-of-struct-path.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
