diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2020-06-09 14:33:11 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2020-06-30 13:04:45 +0200 |
| commit | 5902f4dd6e666c4d160b2f5c4505f7e58642d2bf (patch) | |
| tree | 5ec4fcdc9b500802ddb6916b3ebab9acc1fbcf22 /fs/gfs2/inode.c | |
| parent | Linux 5.8-rc3 (diff) | |
| download | linux-5902f4dd6e666c4d160b2f5c4505f7e58642d2bf.tar.xz linux-5902f4dd6e666c4d160b2f5c4505f7e58642d2bf.zip | |
gfs2: Don't return NULL from gfs2_inode_lookup
Callers expect gfs2_inode_lookup to return an inode pointer or ERR_PTR(error).
Commit b66648ad6dcf caused it to return NULL instead of ERR_PTR(-ESTALE) in
some cases. Fix that.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: b66648ad6dcf ("gfs2: Move inode generation number check into gfs2_inode_lookup")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/inode.c')
| -rw-r--r-- | fs/gfs2/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 370c3a4b31ac..6774865f5b5b 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -207,10 +207,11 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type, if (no_formal_ino && ip->i_no_formal_ino && no_formal_ino != ip->i_no_formal_ino) { + error = -ESTALE; if (inode->i_state & I_NEW) goto fail; iput(inode); - return ERR_PTR(-ESTALE); + return ERR_PTR(error); } if (inode->i_state & I_NEW) |