diff options
| author | Alex Elder <aelder@sgi.com> | 2011-08-08 14:06:24 +0200 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-08-08 14:06:24 +0200 |
| commit | 2ddb4e94065470828e131351566102274ea9e83f (patch) | |
| tree | 3eb237d28e10d7735d57c051880e8173113acef8 /fs/pipe.c | |
| parent | xfs: Remove the macro XFS_BUFTARG_NAME (diff) | |
| parent | Linux 3.1-rc1 (diff) | |
| download | linux-2ddb4e94065470828e131351566102274ea9e83f.tar.xz linux-2ddb4e94065470828e131351566102274ea9e83f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index da42f7db50de..0e0be1dc0f8e 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -948,7 +948,7 @@ static const struct dentry_operations pipefs_dentry_operations = { static struct inode * get_pipe_inode(void) { - struct inode *inode = new_inode(pipe_mnt->mnt_sb); + struct inode *inode = new_inode_pseudo(pipe_mnt->mnt_sb); struct pipe_inode_info *pipe; if (!inode) @@ -1291,8 +1291,8 @@ static int __init init_pipe_fs(void) static void __exit exit_pipe_fs(void) { + kern_unmount(pipe_mnt); unregister_filesystem(&pipe_fs_type); - mntput(pipe_mnt); } fs_initcall(init_pipe_fs); |