projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GFS2: d_splice_alias() can't return error
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
fs
/
gfs2
/
inode.c
diff --git
a/fs/gfs2/inode.c
b/fs/gfs2/inode.c
index
64915ee
..
6d7f976
100644
(file)
--- 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 (!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))
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);
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;
return error;
} else if (error != -ENOENT) {
goto fail_gunlock;