From: Dave Chinner <david@fromorbit.com>
Date: Thu, 21 Apr 2022 06:45:52 +0000 (+1000)
Subject: Merge branch 'guilt/xlog-write-rework' into xfs-5.19-for-next
X-Git-Tag: v5.19-rc1~147^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=463260d7670566c357dfa2c38bc3124c98b646bc;p=thirdparty%2Flinux.git

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

463260d7670566c357dfa2c38bc3124c98b646bc
diff --cc fs/xfs/xfs_log_priv.h
index 438df48a84c40,4b7303ca1741c..4f7e844d28ade
--- a/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;
  
  /*