xfs: rename the old_crc variable in xlog_recover_process

[ Upstream commit 0b737f4ac1d3ec093347241df74bbf5f54a7e16c ]

old_crc is a very misleading name.  Rename it to expected_crc as that
described the usage much better.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Stable-dep-of: e747883c7d73 ("xfs: fix log CRC mismatches between i386 and other architectures")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 705cd5a60fbc9379948a7bee3e72b201fa881b69..899fd45ee1552e9870844012f5c4e109c7a4b163 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2864,20 +2864,19 @@ xlog_recover_process(
        int                     pass,
        struct list_head        *buffer_list)
 {
-       __le32                  old_crc = rhead->h_crc;
-       __le32                  crc;
+       __le32                  expected_crc = rhead->h_crc, crc;
 
        crc = xlog_cksum(log, rhead, dp, be32_to_cpu(rhead->h_len));
 
        /*
         * Nothing else to do if this is a CRC verification pass. Just return
         * if this a record with a non-zero crc. Unfortunately, mkfs always
-        * sets old_crc to 0 so we must consider this valid even on v5 supers.
-        * Otherwise, return EFSBADCRC on failure so the callers up the stack
-        * know precisely what failed.
+        * sets expected_crc to 0 so we must consider this valid even on v5
+        * supers.  Otherwise, return EFSBADCRC on failure so the callers up the
+        * stack know precisely what failed.
         */
        if (pass == XLOG_RECOVER_CRCPASS) {
-               if (old_crc && crc != old_crc)
+               if (expected_crc && crc != expected_crc)
                        return -EFSBADCRC;
                return 0;
        }
@@ -2888,11 +2887,11 @@ xlog_recover_process(
         * zero CRC check prevents warnings from being emitted when upgrading
         * the kernel from one that does not add CRCs by default.
         */
-       if (crc != old_crc) {
-               if (old_crc || xfs_has_crc(log->l_mp)) {
+       if (crc != expected_crc) {
+               if (expected_crc || xfs_has_crc(log->l_mp)) {
                        xfs_alert(log->l_mp,
                "log record CRC mismatch: found 0x%x, expected 0x%x.",
-                                       le32_to_cpu(old_crc),
+                                       le32_to_cpu(expected_crc),
                                        le32_to_cpu(crc));
                        xfs_hex_dump(dp, 32);
                }