Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40519
b: refs/heads/master
c: 316bb95
h: refs/heads/master
i:
  40517: 245d994
  40515: c32f90b
  40511: 0b4d25e
v: v3
  • Loading branch information
Michael Halcrow authored and Linus Torvalds committed Oct 31, 2006
1 parent 210c9b2 commit d5bbca5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7ff1d74f5670329ac4b5959a675f8698ba95be20
refs/heads/master: 316bb95e8ed0ddcd767e8aa54264b6c6190f150c
18 changes: 0 additions & 18 deletions trunk/fs/ecryptfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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
};

0 comments on commit d5bbca5

Please sign in to comment.