diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2006-10-31 01:07:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-31 11:07:01 -0500 |
commit | 316bb95e8ed0ddcd767e8aa54264b6c6190f150c (patch) | |
tree | 6dc89abf8c1d64a61481cbaa288ad2f3afcf51e9 /fs/ecryptfs | |
parent | 7ff1d74f5670329ac4b5959a675f8698ba95be20 (diff) |
[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: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/super.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c index c337c0410fb1..825757ae4867 100644 --- a/fs/ecryptfs/super.c +++ b/fs/ecryptfs/super.c | |||
@@ -138,23 +138,6 @@ static void ecryptfs_clear_inode(struct inode *inode) | |||
138 | } | 138 | } |
139 | 139 | ||
140 | /** | 140 | /** |
141 | * ecryptfs_umount_begin | ||
142 | * | ||
143 | * Called in do_umount(). | ||
144 | */ | ||
145 | static void ecryptfs_umount_begin(struct vfsmount *vfsmnt, int flags) | ||
146 | { | ||
147 | struct vfsmount *lower_mnt = | ||
148 | ecryptfs_dentry_to_lower_mnt(vfsmnt->mnt_sb->s_root); | ||
149 | struct super_block *lower_sb; | ||
150 | |||
151 | mntput(lower_mnt); | ||
152 | lower_sb = lower_mnt->mnt_sb; | ||
153 | if (lower_sb->s_op->umount_begin) | ||
154 | lower_sb->s_op->umount_begin(lower_mnt, flags); | ||
155 | } | ||
156 | |||
157 | /** | ||
158 | * ecryptfs_show_options | 141 | * ecryptfs_show_options |
159 | * | 142 | * |
160 | * Prints the directory we are currently mounted over. | 143 | * Prints the directory we are currently mounted over. |
@@ -193,6 +176,5 @@ struct super_operations ecryptfs_sops = { | |||
193 | .statfs = ecryptfs_statfs, | 176 | .statfs = ecryptfs_statfs, |
194 | .remount_fs = NULL, | 177 | .remount_fs = NULL, |
195 | .clear_inode = ecryptfs_clear_inode, | 178 | .clear_inode = ecryptfs_clear_inode, |
196 | .umount_begin = ecryptfs_umount_begin, | ||
197 | .show_options = ecryptfs_show_options | 179 | .show_options = ecryptfs_show_options |
198 | }; | 180 | }; |