From 8a562a6e21356a0787f1c87e385a425b7264661d Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Thu, 21 Nov 2013 18:47:57 +0000 Subject: GFS2: Fix ref count bug relating to atomic_open commit ea0341e071527d5cec350917b01ab901af09d758 upstream. In the case that atomic_open calls finish_no_open() with the dentry that was supplied to gfs2_atomic_open() an extra reference count is required. This patch fixes that issue preventing a bug trap triggering at umount time. Signed-off-by: Steven Whitehouse Signed-off-by: Greg Kroah-Hartman --- fs/gfs2/inode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fs/gfs2') diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 968d4c56e5eb..12987666e5f0 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1168,8 +1168,11 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry, if (d != NULL) dentry = d; if (dentry->d_inode) { - if (!(*opened & FILE_OPENED)) + if (!(*opened & FILE_OPENED)) { + if (d == NULL) + dget(dentry); return finish_no_open(file, dentry); + } dput(d); return 0; } -- cgit v1.2.3