gfs2: gfs2_create_inode error handling fix

[ Upstream commit af4044fd0b77e915736527dd83011e46e6415f01 ]

When gfs2_create_inode() finds a directory, make sure to return -EISDIR.

Fixes: 571a4b57975a ("GFS2: bugger off early if O_CREAT open finds a directory")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 22905a076a6a2461b5154215500590360cb609b4..f266dec2051756fc7d699e97c07d6d381b59c42f 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -636,7 +636,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
        if (!IS_ERR(inode)) {
                if (S_ISDIR(inode->i_mode)) {
                        iput(inode);
-                       inode = ERR_PTR(-EISDIR);
+                       inode = NULL;
+                       error = -EISDIR;
                        goto fail_gunlock;
                }
                d_instantiate(dentry, inode);