diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2014-01-16 13:51:07 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2014-01-18 09:50:53 +0000 |
| commit | d57b9c9a999a8f4475fe73fba629c964245800ca (patch) | |
| tree | 70f6d70100cdbcf9590a3383c240606f6481e47b /fs | |
| parent | 8b127d0494890ced4e35fb8eca6d6b57564ee1c6 (diff) | |
| download | linux-d57b9c9a999a8f4475fe73fba629c964245800ca.tar.gz linux-d57b9c9a999a8f4475fe73fba629c964245800ca.tar.bz2 linux-d57b9c9a999a8f4475fe73fba629c964245800ca.zip | |
GFS2: revert "GFS2: d_splice_alias() can't return error"
0d0d110720d7960b77c03c9f2597faaff4b484ae asserts that "d_splice_alias()
can't return error unless it was given an IS_ERR(inode)".
That was true of the implementation of d_splice_alias, but this is
really a problem with d_splice_alias: at a minimum it should be able to
return -ELOOP in the case where inserting the given dentry would cause a
directory loop.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/inode.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index b8956f24e3d3..890588c7fb33 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -604,6 +604,9 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, error = PTR_ERR(inode); if (!IS_ERR(inode)) { d = d_splice_alias(inode, dentry); + error = PTR_ERR(d); + if (IS_ERR(d)) + goto fail_gunlock; error = 0; if (file) { if (S_ISREG(inode->i_mode)) { @@ -799,6 +802,11 @@ static struct dentry *__gfs2_lookup(struct inode *dir, struct dentry *dentry, } d = d_splice_alias(inode, dentry); + if (IS_ERR(d)) { + iput(inode); + gfs2_glock_dq_uninit(&gh); + return d; + } if (file && S_ISREG(inode->i_mode)) error = finish_open(file, dentry, gfs2_open_common, opened); |