From c3101fda3b1616c6e664d2a23f59c68c81a4baf3 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Mon, 18 Dec 2006 13:31:18 +0000
Subject: [PATCH] --- yaml --- r: 44855 b: refs/heads/master c:
 5ccac88eeb5659c716af8e695e2943509c80d172 h: refs/heads/master i:   44853:
 805c60fc8b5ffe7be95fd22808f8ecaa42d44c32   44851:
 a43a9c393fcd213ef9d3f72ac2eb2cb632ece699   44847:
 d89a4e844b1b3d4b980c164687050c780cf261d4 v: v3

---
 [refs]          | 2 +-
 trunk/fs/pipe.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c4641a64d26..b2b0440e5f7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba6d8b1eba88665d12edd53385d3e26fce5613a3
+refs/heads/master: 5ccac88eeb5659c716af8e695e2943509c80d172
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
index 9a06e8e48e8d..68090e84f589 100644
--- a/trunk/fs/pipe.c
+++ b/trunk/fs/pipe.c
@@ -935,8 +935,9 @@ struct file *create_write_pipe(void)
 
 void free_write_pipe(struct file *f)
 {
-	mntput(f->f_path.mnt);
+	free_pipe_info(f->f_dentry->d_inode);
 	dput(f->f_path.dentry);
+	mntput(f->f_path.mnt);
 	put_filp(f);
 }
 
@@ -994,6 +995,8 @@ int do_pipe(int *fd)
  err_fdr:
 	put_unused_fd(fdr);
  err_read_pipe:
+	dput(fr->f_dentry);
+	mntput(fr->f_vfsmnt);
 	put_filp(fr);
  err_write_pipe:
 	free_write_pipe(fw);