summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2013-09-16 14:52:00 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2013-09-17 10:04:07 +0100
commit0d0d110720d7960b77c03c9f2597faaff4b484ae (patch)
tree1f244a7d2d2c3474bb215542265d79a51de07a4b /fs/gfs2
parent272b98c6455f00884f0350f775c5342358ebb73f (diff)
downloadop-kernel-dev-0d0d110720d7960b77c03c9f2597faaff4b484ae.zip
op-kernel-dev-0d0d110720d7960b77c03c9f2597faaff4b484ae.tar.gz
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
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/inode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 64915ee..6d7f976 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;
OpenPOWER on IntegriCloud