Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 316bb95e authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

[PATCH] eCryptfs: Remove ecryptfs_umount_begin 



There is no point to calling the lower umount_begin when the eCryptfs
umount_begin is called.

Signed-off-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7ff1d74f

fs/ecryptfs/super.c

+0 −18
Original line number Diff line number Diff line
@@ -137,23 +137,6 @@ static void ecryptfs_clear_inode(struct inode *inode) 
	iput(ecryptfs_inode_to_lower(inode));

}



/**

 * 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

 *
@@ -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

};