Merge branch 'guilt/xlog-write-rework' into xfs-5.19-for-next

diff --cc fs/xfs/xfs_log.c
Simple merge

diff --cc fs/xfs/xfs_log.h
Simple merge

diff --cc fs/xfs/xfs_log_priv.h
index 438df48,4b7303c..4f7e844
--- 1/fs/xfs/xfs_log_priv.h
--- 2/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@@ -164,15 -151,7 +151,7 @@@ typedef struct xlog_ticket 
        int                t_unit_res;   /* unit reservation in bytes    : 4  */
        char               t_ocnt;       /* original count               : 1  */
        char               t_cnt;        /* current count                : 1  */
-       char               t_clientid;   /* who does this belong to;     : 1  */
 -      char               t_flags;      /* properties of reservation    : 1  */
 +      uint8_t            t_flags;      /* properties of reservation    : 1  */
- 
-         /* reservation array fields */
-       uint               t_res_num;                    /* num in array : 4 */
-       uint               t_res_num_ophdrs;             /* num op hdrs  : 4 */
-       uint               t_res_arr_sum;                /* array sum    : 4 */
-       uint               t_res_o_flow;                 /* sum overflow : 4 */
-       xlog_res_t         t_res_arr[XLOG_TIC_LEN_MAX];  /* array of res : 8 * 15 */ 
  } xlog_ticket_t;
  
  /*

diff --cc fs/xfs/xfs_trans.c
Simple merge