xfs: add a XLOG_CYCLE_DATA_SIZE constant

The XLOG_HEADER_CYCLE_SIZE / BBSIZE expression is used a lot
in the log code, give it a symbolic name.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index 6c50cb2ece1972b2c5a7e515f14028fc8e7233ed..91a841ea5bb36d3606e510abd6e07958b9cb17e4 100644 (file)
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -31,6 +31,7 @@ typedef uint32_t xlog_tid_t;
 #define XLOG_BIG_RECORD_BSIZE  (32*1024)       /* 32k buffers */
 #define XLOG_MAX_RECORD_BSIZE  (256*1024)
 #define XLOG_HEADER_CYCLE_SIZE (32*1024)       /* cycle data in header */
+#define XLOG_CYCLE_DATA_SIZE   (XLOG_HEADER_CYCLE_SIZE / BBSIZE)
 #define XLOG_MIN_RECORD_BSHIFT 14              /* 16384 == 1 << 14 */
 #define XLOG_BIG_RECORD_BSHIFT 15              /* 32k == 1 << 15 */
 #define XLOG_MAX_RECORD_BSHIFT 18              /* 256k == 1 << 18 */
@@ -135,7 +136,7 @@ typedef struct xlog_rec_header {
        __le32    h_crc;        /* crc of log record                    :  4 */
        __be32    h_prev_block; /* block number to previous LR          :  4 */
        __be32    h_num_logops; /* number of log operations in this LR  :  4 */
-       __be32    h_cycle_data[XLOG_HEADER_CYCLE_SIZE / BBSIZE];
+       __be32    h_cycle_data[XLOG_CYCLE_DATA_SIZE];
 
        /* fields added by the Linux port: */
        __be32    h_fmt;        /* format of log record                 :  4 */
@@ -172,7 +173,7 @@ typedef struct xlog_rec_header {
 
 typedef struct xlog_rec_ext_header {
        __be32    xh_cycle;     /* write cycle of log                   : 4 */
-       __be32    xh_cycle_data[XLOG_HEADER_CYCLE_SIZE / BBSIZE]; /*    : 256 */
+       __be32    xh_cycle_data[XLOG_CYCLE_DATA_SIZE];          /*      : 256 */
 } xlog_rec_ext_header_t;
 
 /*

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 603e85c1ab4cd7544ebb9ed373ae094d0a0aa004..e09e5f71ed8c6d62ac183f11834684ce4036e435 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1533,7 +1533,7 @@ xlog_pack_data(
 
        dp = iclog->ic_datap;
        for (i = 0; i < BTOBB(size); i++) {
-               if (i >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE))
+               if (i >= XLOG_CYCLE_DATA_SIZE)
                        break;
                iclog->ic_header.h_cycle_data[i] = *(__be32 *)dp;
                *(__be32 *)dp = cycle_lsn;
@@ -1544,8 +1544,8 @@ xlog_pack_data(
                xlog_in_core_2_t *xhdr = iclog->ic_data;
 
                for ( ; i < BTOBB(size); i++) {
-                       j = i / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
-                       k = i % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
+                       j = i / XLOG_CYCLE_DATA_SIZE;
+                       k = i % XLOG_CYCLE_DATA_SIZE;
                        xhdr[j].hic_xheader.xh_cycle_data[k] = *(__be32 *)dp;
                        *(__be32 *)dp = cycle_lsn;
                        dp += BBSIZE;
@@ -3368,9 +3368,9 @@ xlog_verify_iclog(
                        clientid = ophead->oh_clientid;
                } else {
                        idx = BTOBBT((void *)&ophead->oh_clientid - iclog->ic_datap);
-                       if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {
-                               j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
-                               k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
+                       if (idx >= XLOG_CYCLE_DATA_SIZE) {
+                               j = idx / XLOG_CYCLE_DATA_SIZE;
+                               k = idx % XLOG_CYCLE_DATA_SIZE;
                                clientid = xlog_get_client_id(
                                        xhdr[j].hic_xheader.xh_cycle_data[k]);
                        } else {
@@ -3392,9 +3392,9 @@ xlog_verify_iclog(
                        op_len = be32_to_cpu(ophead->oh_len);
                } else {
                        idx = BTOBBT((void *)&ophead->oh_len - iclog->ic_datap);
-                       if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {
-                               j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
-                               k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
+                       if (idx >= XLOG_CYCLE_DATA_SIZE) {
+                               j = idx / XLOG_CYCLE_DATA_SIZE;
+                               k = idx % XLOG_CYCLE_DATA_SIZE;
                                op_len = be32_to_cpu(xhdr[j].hic_xheader.xh_cycle_data[k]);
                        } else {
                                op_len = be32_to_cpu(iclog->ic_header.h_cycle_data[idx]);

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 549d60959aee5be803d7870ed92eaca5af9b69b0..bb2b3f976deb3783edc57d21fd05517ec42604fc 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2866,7 +2866,7 @@ xlog_unpack_data(
        int                     i, j, k;
 
        for (i = 0; i < BTOBB(be32_to_cpu(rhead->h_len)) &&
-                 i < (XLOG_HEADER_CYCLE_SIZE / BBSIZE); i++) {
+                 i < XLOG_CYCLE_DATA_SIZE; i++) {
                *(__be32 *)dp = *(__be32 *)&rhead->h_cycle_data[i];
                dp += BBSIZE;
        }
@@ -2874,8 +2874,8 @@ xlog_unpack_data(
        if (xfs_has_logv2(log->l_mp)) {
                xlog_in_core_2_t *xhdr = (xlog_in_core_2_t *)rhead;
                for ( ; i < BTOBB(be32_to_cpu(rhead->h_len)); i++) {
-                       j = i / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
-                       k = i % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
+                       j = i / XLOG_CYCLE_DATA_SIZE;
+                       k = i % XLOG_CYCLE_DATA_SIZE;
                        *(__be32 *)dp = xhdr[j].hic_xheader.xh_cycle_data[k];
                        dp += BBSIZE;
                }