* [PATCH V2] xfsprogs: xfs_fsr: Verify bulkstat version information in qsort's cmp()
@ 2021-01-28 5:20 Chandan Babu R
2021-01-28 6:56 ` Chaitanya Kulkarni
2021-01-28 17:36 ` Darrick J. Wong
0 siblings, 2 replies; 3+ messages in thread
From: Chandan Babu R @ 2021-01-28 5:20 UTC (permalink / raw)
To: linux-xfs; +Cc: Chandan Babu R, sandeen, Darrick J . Wong
This commit introduces a check to verify that correct bulkstat structures are
being processed by qsort's cmp() function.
Suggested-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
V1 -> V2:
1. Include XFS_BULKSTAT_VERSION_V1 as a possible bulkstat version
number.
2. Fix coding style issue.
fsr/xfs_fsr.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index b885395e..6cf8bfb7 100644
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -582,8 +582,15 @@ fsrall_cleanup(int timeout)
static int
cmp(const void *s1, const void *s2)
{
- return( ((struct xfs_bulkstat *)s2)->bs_extents -
- ((struct xfs_bulkstat *)s1)->bs_extents);
+ const struct xfs_bulkstat *bs1 = s1;
+ const struct xfs_bulkstat *bs2 = s2;
+
+ ASSERT((bs1->bs_version == XFS_BULKSTAT_VERSION_V1 &&
+ bs2->bs_version == XFS_BULKSTAT_VERSION_V1) ||
+ (bs1->bs_version == XFS_BULKSTAT_VERSION_V5 &&
+ bs2->bs_version == XFS_BULKSTAT_VERSION_V5));
+
+ return (bs2->bs_extents - bs1->bs_extents);
}
/*
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH V2] xfsprogs: xfs_fsr: Verify bulkstat version information in qsort's cmp()
2021-01-28 5:20 [PATCH V2] xfsprogs: xfs_fsr: Verify bulkstat version information in qsort's cmp() Chandan Babu R
@ 2021-01-28 6:56 ` Chaitanya Kulkarni
2021-01-28 17:36 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Chaitanya Kulkarni @ 2021-01-28 6:56 UTC (permalink / raw)
To: Chandan Babu R, linux-xfs@vger.kernel.org
Cc: sandeen@sandeen.net, Darrick J . Wong
On 1/27/21 9:23 PM, Chandan Babu R wrote:
> This commit introduces a check to verify that correct bulkstat structures are
> being processed by qsort's cmp() function.
>
> Suggested-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V2] xfsprogs: xfs_fsr: Verify bulkstat version information in qsort's cmp()
2021-01-28 5:20 [PATCH V2] xfsprogs: xfs_fsr: Verify bulkstat version information in qsort's cmp() Chandan Babu R
2021-01-28 6:56 ` Chaitanya Kulkarni
@ 2021-01-28 17:36 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2021-01-28 17:36 UTC (permalink / raw)
To: Chandan Babu R; +Cc: linux-xfs, sandeen
On Thu, Jan 28, 2021 at 10:50:58AM +0530, Chandan Babu R wrote:
> This commit introduces a check to verify that correct bulkstat structures are
> being processed by qsort's cmp() function.
>
> Suggested-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
> ---
Looks good to me,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> V1 -> V2:
> 1. Include XFS_BULKSTAT_VERSION_V1 as a possible bulkstat version
> number.
> 2. Fix coding style issue.
>
> fsr/xfs_fsr.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
> index b885395e..6cf8bfb7 100644
> --- a/fsr/xfs_fsr.c
> +++ b/fsr/xfs_fsr.c
> @@ -582,8 +582,15 @@ fsrall_cleanup(int timeout)
> static int
> cmp(const void *s1, const void *s2)
> {
> - return( ((struct xfs_bulkstat *)s2)->bs_extents -
> - ((struct xfs_bulkstat *)s1)->bs_extents);
> + const struct xfs_bulkstat *bs1 = s1;
> + const struct xfs_bulkstat *bs2 = s2;
> +
> + ASSERT((bs1->bs_version == XFS_BULKSTAT_VERSION_V1 &&
> + bs2->bs_version == XFS_BULKSTAT_VERSION_V1) ||
> + (bs1->bs_version == XFS_BULKSTAT_VERSION_V5 &&
> + bs2->bs_version == XFS_BULKSTAT_VERSION_V5));
> +
> + return (bs2->bs_extents - bs1->bs_extents);
> }
>
> /*
> --
> 2.29.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-28 17:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-28 5:20 [PATCH V2] xfsprogs: xfs_fsr: Verify bulkstat version information in qsort's cmp() Chandan Babu R
2021-01-28 6:56 ` Chaitanya Kulkarni
2021-01-28 17:36 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox