From 4c142948d13a21df378062fd55836945db33c667 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 10 Jul 2019 10:18:32 -0400 Subject: [PATCH] LU-12137 osd-ldiskfs: use ERR_CAST in osd_oi_index_open() In osd_oi_index_open() when dentry is invalid it is void casting the invalid dentry being returned. This is what ERR_CAST was invented for so use it. Test-Parameters: trivial Change-Id: I71016ff9c9dfc4408db8ab14576ba87dd6dc352d Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/35455 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Neil Brown Reviewed-by: Alex Zhuravlev Reviewed-by: Andreas Dilger --- lustre/osd-ldiskfs/osd_oi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/osd-ldiskfs/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c index bb9cd1b..483f6a3 100644 --- a/lustre/osd-ldiskfs/osd_oi.c +++ b/lustre/osd-ldiskfs/osd_oi.c @@ -164,7 +164,7 @@ static struct inode *osd_oi_index_open(struct osd_thread_info *info, dentry = osd_lookup_one_len_unlocked(name, osd_sb(osd)->s_root, strlen(name)); if (IS_ERR(dentry)) - return (void *) dentry; + return ERR_CAST(dentry); if (dentry->d_inode) { LASSERT(!is_bad_inode(dentry->d_inode)); @@ -187,7 +187,7 @@ static struct inode *osd_oi_index_open(struct osd_thread_info *info, dentry = osd_lookup_one_len_unlocked(name, osd_sb(osd)->s_root, strlen(name)); if (IS_ERR(dentry)) - return (void *) dentry; + return ERR_CAST(dentry); if (dentry->d_inode) { LASSERT(!is_bad_inode(dentry->d_inode)); -- 1.8.3.1