From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Szeredi Subject: [PATCH 12/16] vfs: do_dentry_open(): don't put filp Date: Mon, 21 May 2012 17:30:16 +0200 Message-ID: <1337614220-6174-13-git-send-email-miklos@szeredi.hu> References: <1337614220-6174-1-git-send-email-miklos@szeredi.hu> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, hch@infradead.org, torvalds@linux-foundation.org, mszeredi@suse.cz To: viro@ZenIV.linux.org.uk Return-path: In-Reply-To: <1337614220-6174-1-git-send-email-miklos@szeredi.hu> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Miklos Szeredi Move put_filp() out to __dentry_open(), the only caller now. Signed-off-by: Miklos Szeredi --- fs/open.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/open.c b/fs/open.c index 971b474..e1448cd 100644 --- a/fs/open.c +++ b/fs/open.c @@ -737,7 +737,6 @@ cleanup_all: f->f_path.dentry = NULL; f->f_path.mnt = NULL; cleanup_file: - put_filp(f); dput(dentry); mntput(mnt); return ERR_PTR(error); @@ -755,6 +754,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, fput(res); res = ERR_PTR(error); } + } else { + put_filp(f); } return res; } -- 1.7.7