diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /fs/super.c | |
parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index 25bc1ec6bc5d..6e57ee252e14 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -840,7 +840,6 @@ do_kern_mount(const char *fstype, int flags, const char *name, void *data) | |||
840 | mnt->mnt_root = dget(sb->s_root); | 840 | mnt->mnt_root = dget(sb->s_root); |
841 | mnt->mnt_mountpoint = sb->s_root; | 841 | mnt->mnt_mountpoint = sb->s_root; |
842 | mnt->mnt_parent = mnt; | 842 | mnt->mnt_parent = mnt; |
843 | mnt->mnt_namespace = current->namespace; | ||
844 | up_write(&sb->s_umount); | 843 | up_write(&sb->s_umount); |
845 | free_secdata(secdata); | 844 | free_secdata(secdata); |
846 | put_filesystem(type); | 845 | put_filesystem(type); |