From: Darrick J. Wong Date: Tue, 25 Oct 2016 22:14:30 +0000 (-0700) Subject: xfs_logprint: fix up the RUI printing code to reflect new format X-Git-Tag: v4.9.0-rc1~64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f123ccebd3a74f4c032401cc879171b05398bbc;p=thirdparty%2Fxfsprogs-dev.git xfs_logprint: fix up the RUI printing code to reflect new format We changed the RUI format to use a variable length array, so update the logprint code to reflect that. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- diff --git a/logprint/log_redo.c b/logprint/log_redo.c index add0764ef..40e072725 100644 --- a/logprint/log_redo.c +++ b/logprint/log_redo.c @@ -240,8 +240,7 @@ xfs_rui_copy_format( int continued) { uint nextents = ((struct xfs_rui_log_format *)buf)->rui_nextents; - uint dst_len = sizeof(struct xfs_rui_log_format) + - (nextents - 1) * sizeof(struct xfs_map_extent); + uint dst_len = xfs_rui_log_format_sizeof(nextents); if (len == dst_len || continued) { memcpy((char *)dst_fmt, buf, len); @@ -283,8 +282,7 @@ xlog_print_trans_rui( /* convert to native format */ nextents = src_f->rui_nextents; - dst_len = sizeof(struct xfs_rui_log_format) + - (nextents - 1) * sizeof(struct xfs_map_extent); + dst_len = xfs_rui_log_format_sizeof(nextents); if (continued && src_len < core_size) { printf(_("RUI: Not enough data to decode further\n"));