| Message ID | 20220830133939.2726749-3-zengheng4@huawei.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | Simplify if-else condition for clean code | expand |
On Tue, Aug 30, 2022 at 09:39:39PM +0800, Zeng Heng wrote: > "else" is not generally useful after a return, > so remove it for clean code. > > There is no logical changes. > > Signed-off-by: Zeng Heng <zengheng4@huawei.com> Looks correct to me, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/xfs_reflink.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c > index 251f20ddd368..93bdd25680bc 100644 > --- a/fs/xfs/xfs_reflink.c > +++ b/fs/xfs/xfs_reflink.c > @@ -200,7 +200,9 @@ xfs_reflink_trim_around_shared( > if (fbno == NULLAGBLOCK) { > /* No shared blocks at all. */ > return 0; > - } else if (fbno == agbno) { > + } > + > + if (fbno == agbno) { > /* > * The start of this extent is shared. Truncate the > * mapping at the end of the shared region so that a > @@ -210,16 +212,16 @@ xfs_reflink_trim_around_shared( > irec->br_blockcount = flen; > *shared = true; > return 0; > - } else { > - /* > - * There's a shared extent midway through this extent. > - * Truncate the mapping at the start of the shared > - * extent so that a subsequent iteration starts at the > - * start of the shared region. > - */ > - irec->br_blockcount = fbno - agbno; > - return 0; > } > + > + /* > + * There's a shared extent midway through this extent. > + * Truncate the mapping at the start of the shared > + * extent so that a subsequent iteration starts at the > + * start of the shared region. > + */ > + irec->br_blockcount = fbno - agbno; > + return 0; > } > > int > -- > 2.25.1 >
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 251f20ddd368..93bdd25680bc 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -200,7 +200,9 @@ xfs_reflink_trim_around_shared( if (fbno == NULLAGBLOCK) { /* No shared blocks at all. */ return 0; - } else if (fbno == agbno) { + } + + if (fbno == agbno) { /* * The start of this extent is shared. Truncate the * mapping at the end of the shared region so that a @@ -210,16 +212,16 @@ xfs_reflink_trim_around_shared( irec->br_blockcount = flen; *shared = true; return 0; - } else { - /* - * There's a shared extent midway through this extent. - * Truncate the mapping at the start of the shared - * extent so that a subsequent iteration starts at the - * start of the shared region. - */ - irec->br_blockcount = fbno - agbno; - return 0; } + + /* + * There's a shared extent midway through this extent. + * Truncate the mapping at the start of the shared + * extent so that a subsequent iteration starts at the + * start of the shared region. + */ + irec->br_blockcount = fbno - agbno; + return 0; } int
"else" is not generally useful after a return, so remove it for clean code. There is no logical changes. Signed-off-by: Zeng Heng <zengheng4@huawei.com> --- fs/xfs/xfs_reflink.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)