| Message ID | 20240828085908.35695-1-shenlichuan@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1] ubifs: Convert to use ERR_CAST() | expand |
在 2024/8/28 16:59, Shen Lichuan 写道: > As opposed to open-code, using the ERR_CAST macro clearly indicates that > this is a pointer to an error value and a type conversion was performed. > > Signed-off-by: Shen Lichuan <shenlichuan@vivo.com> > --- > fs/ubifs/lpt_commit.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com> > diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c > index 07351fdce722..aa8837e6247c 100644 > --- a/fs/ubifs/lpt_commit.c > +++ b/fs/ubifs/lpt_commit.c > @@ -577,7 +577,7 @@ static struct ubifs_pnode *next_pnode_to_dirty(struct ubifs_info *c, > /* Go right */ > nnode = ubifs_get_nnode(c, nnode, iip); > if (IS_ERR(nnode)) > - return (void *)nnode; > + return ERR_CAST(nnode); > > /* Go down to level 1 */ > while (nnode->level > 1) { > @@ -594,7 +594,7 @@ static struct ubifs_pnode *next_pnode_to_dirty(struct ubifs_info *c, > } > nnode = ubifs_get_nnode(c, nnode, iip); > if (IS_ERR(nnode)) > - return (void *)nnode; > + return ERR_CAST(nnode); > } > > for (iip = 0; iip < UBIFS_LPT_FANOUT; iip++) >
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index 07351fdce722..aa8837e6247c 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c @@ -577,7 +577,7 @@ static struct ubifs_pnode *next_pnode_to_dirty(struct ubifs_info *c, /* Go right */ nnode = ubifs_get_nnode(c, nnode, iip); if (IS_ERR(nnode)) - return (void *)nnode; + return ERR_CAST(nnode); /* Go down to level 1 */ while (nnode->level > 1) { @@ -594,7 +594,7 @@ static struct ubifs_pnode *next_pnode_to_dirty(struct ubifs_info *c, } nnode = ubifs_get_nnode(c, nnode, iip); if (IS_ERR(nnode)) - return (void *)nnode; + return ERR_CAST(nnode); } for (iip = 0; iip < UBIFS_LPT_FANOUT; iip++)
As opposed to open-code, using the ERR_CAST macro clearly indicates that this is a pointer to an error value and a type conversion was performed. Signed-off-by: Shen Lichuan <shenlichuan@vivo.com> --- fs/ubifs/lpt_commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)