diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-07 05:34:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-07 05:35:05 -0400 |
commit | 56fdd18c7b89a2fac1dfe5d54750c9143867fdc4 (patch) | |
tree | ce48eee7d5960936fa6e385320b7a261a8bee071 /fs/ecryptfs/main.c | |
parent | 7caf6a49bb17d0377210693af5737563b31aa5ee (diff) | |
parent | b87297fb405ef13cac375f202d114323b076a56d (diff) |
Merge branch 'linus' into core/iommu
Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
to resync with the latest upstream fixes and make sure
the combination works fine.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r-- | fs/ecryptfs/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index ccabd5faa04..9f0aa9883c2 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
@@ -614,9 +614,8 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags, | |||
614 | } | 614 | } |
615 | goto out; | 615 | goto out; |
616 | out_abort: | 616 | out_abort: |
617 | dput(sb->s_root); | 617 | dput(sb->s_root); /* aka mnt->mnt_root, as set by get_sb_nodev() */ |
618 | up_write(&sb->s_umount); | 618 | deactivate_locked_super(sb); |
619 | deactivate_super(sb); | ||
620 | out: | 619 | out: |
621 | return rc; | 620 | return rc; |
622 | } | 621 | } |