1 files changed, 2 insertions, 19 deletions

diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 9bd3cdf11a87..752f964b3699 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -30,17 +30,16 @@ struct xfs_mount;
  */
 
 #define XLOG_MIN_ICLOGS         2
-#define XLOG_MED_ICLOGS         4
 #define XLOG_MAX_ICLOGS         8
 #define XLOG_HEADER_MAGIC_NUM   0xFEEDbabe      /* Invalid cycle number */
 #define XLOG_VERSION_1          1
 #define XLOG_VERSION_2          2               /* Large IClogs, Log sunit */
 #define XLOG_VERSION_OKBITS     (XLOG_VERSION_1 | XLOG_VERSION_2)
-#define XLOG_RECORD_BSIZE       (16*1024)       /* eventually 32k */
+#define XLOG_MIN_RECORD_BSIZE   (16*1024)       /* eventually 32k */
 #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_RECORD_BSHIFT      14              /* 16384 == 1 << 14 */
+#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 */
 #define XLOG_BTOLSUNIT(log, b)  (((b)+(log)->l_mp->m_sb.sb_logsunit-1) / \
@@ -250,22 +249,6 @@ typedef __uint32_t xlog_tid_t;
 
 /* Ticket reservation region accounting */ 
 #define XLOG_TIC_LEN_MAX        15
-#define XLOG_TIC_RESET_RES(t) ((t)->t_res_num = \
-                                (t)->t_res_arr_sum = (t)->t_res_num_ophdrs = 0)
-#define XLOG_TIC_ADD_OPHDR(t) ((t)->t_res_num_ophdrs++)
-#define XLOG_TIC_ADD_REGION(t, len, type)                               \
-        do {                                                            \
-                if ((t)->t_res_num == XLOG_TIC_LEN_MAX) {               \
-                        /* add to overflow and start again */           \
-                        (t)->t_res_o_flow += (t)->t_res_arr_sum;        \
-                        (t)->t_res_num = 0;                             \
-                        (t)->t_res_arr_sum = 0;                         \
-                }                                                       \
-                (t)->t_res_arr[(t)->t_res_num].r_len = (len);           \
-                (t)->t_res_arr[(t)->t_res_num].r_type = (type);         \
-                (t)->t_res_arr_sum += (len);                            \
-                (t)->t_res_num++;                                       \
-        } while (0)
 
 /*
  * Reservation region