From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 16 Sep 2013 12:52:00 +0000 (+0200)
Subject: GFS2: d_splice_alias() can't return error
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0d0d110720d7960b77c03c9f2597faaff4b484ae;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

GFS2: d_splice_alias() can't return error

unless it was given an IS_ERR(inode), which isn't the case here.  So clean
up the unnecessary error handling in gfs2_create_inode().

This paves the way for real fixes (hence the stable Cc).

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: stable@vger.kernel.org
---

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 64915eeae5a7..6d7f976aa328 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -584,7 +584,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 	if (!IS_ERR(inode)) {
 		d = d_splice_alias(inode, dentry);
 		error = 0;
-		if (file && !IS_ERR(d)) {
+		if (file) {
 			if (d == NULL)
 				d = dentry;
 			if (S_ISREG(inode->i_mode))
@@ -593,8 +593,6 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 				error = finish_no_open(file, d);
 		}
 		gfs2_glock_dq_uninit(ghs);
-		if (IS_ERR(d))
-			return PTR_ERR(d);
 		return error;
 	} else if (error != -ENOENT) {
 		goto fail_gunlock;