The patch titled
eCryptfs: mntput() lower mount on umount_begin()
has been removed from the -mm tree. Its filename is
ecryptfs-mntput-lower-mount-on-umount_begin.patch
This patch was dropped because it was folded into ecryptfs-fs-makefile-and-fs-kconfig.patch
------------------------------------------------------
Subject: eCryptfs: mntput() lower mount on umount_begin()
From: Michael Halcrow <mhalcrow@xxxxxxxxxx>
On unmount, eCryptfs needs to decrement the mount count of the lower mount,
or else you cannot unmount the lower filesystem.
Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/super.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff -puN fs/ecryptfs/super.c~ecryptfs-mntput-lower-mount-on-umount_begin fs/ecryptfs/super.c
--- a/fs/ecryptfs/super.c~ecryptfs-mntput-lower-mount-on-umount_begin
+++ a/fs/ecryptfs/super.c
@@ -144,10 +144,7 @@ static void ecryptfs_clear_inode(struct
/**
* ecryptfs_umount_begin
*
- * Called in do_umount() if the MNT_FORCE flag was used and this
- * function is defined. See comment in linux/fs/super.c:do_umount().
- * Used only in nfs, to kill any pending RPC tasks, so that subsequent
- * code can actually succeed and won't leave tasks that need handling.
+ * Called in do_umount().
*/
static void ecryptfs_umount_begin(struct vfsmount *vfsmnt, int flags)
{
@@ -155,6 +152,7 @@ static void ecryptfs_umount_begin(struct
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);
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
origin.patch
ecryptfs-fs-makefile-and-fs-kconfig.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
