From d5bbca526494d5361bd015ef689251e4b7b8ceb6 Mon Sep 17 00:00:00 2001 From: Michael Halcrow Date: Mon, 30 Oct 2006 22:07:20 -0800 Subject: [PATCH] --- yaml --- r: 40519 b: refs/heads/master c: 316bb95e8ed0ddcd767e8aa54264b6c6190f150c h: refs/heads/master i: 40517: 245d9948af3b21915d899144c4cc86e454c8346d 40515: c32f90b79130c7163dbf97a1ad2a21e839929b07 40511: 0b4d25eef67976d288f387d432fca4839430c976 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/super.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index f04bf9f62057..5fc39e66f51d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ff1d74f5670329ac4b5959a675f8698ba95be20 +refs/heads/master: 316bb95e8ed0ddcd767e8aa54264b6c6190f150c diff --git a/trunk/fs/ecryptfs/super.c b/trunk/fs/ecryptfs/super.c index c337c0410fb1..825757ae4867 100644 --- a/trunk/fs/ecryptfs/super.c +++ b/trunk/fs/ecryptfs/super.c @@ -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 };