From: Dave Chinner <david@fromorbit.com>
Date: Sun, 2 Oct 2016 22:56:28 +0000 (+1100)
Subject: Merge branch 'xfs-4.9-log-recovery-fixes' into for-next
X-Git-Tag: v4.13~2178^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=155cd433b516506df065866f3d974661f6473572;p=mirror_ubuntu-bionic-kernel.git

Merge branch 'xfs-4.9-log-recovery-fixes' into for-next
---

155cd433b516506df065866f3d974661f6473572
diff --cc fs/xfs/libxfs/xfs_alloc.h
index f7c520193239,7fd8eafd9abe..7c404a6b0ae3
--- a/fs/xfs/libxfs/xfs_alloc.h
+++ b/fs/xfs/libxfs/xfs_alloc.h
@@@ -85,12 -85,12 +85,12 @@@ typedef struct xfs_alloc_arg 
  	xfs_extlen_t	len;		/* output: actual size of extent */
  	xfs_alloctype_t	type;		/* allocation type XFS_ALLOCTYPE_... */
  	xfs_alloctype_t	otype;		/* original allocation type */
+ 	int		datatype;	/* mask defining data type treatment */
  	char		wasdel;		/* set if allocation was prev delayed */
  	char		wasfromfl;	/* set if allocation is from freelist */
- 	char		userdata;	/* mask defining userdata treatment */
 -	char		isfl;		/* set if is freelist blocks - !acctg */
  	xfs_fsblock_t	firstblock;	/* io first block allocated */
  	struct xfs_owner_info	oinfo;	/* owner of blocks being allocated */
 +	enum xfs_ag_resv_type	resv;	/* block reservation to use */
  } xfs_alloc_arg_t;
  
  /*
diff --cc fs/xfs/libxfs/xfs_bmap.c
index 6fd458674e56,06d1201b4718..9d7f61d36645
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@@ -3783,9 -3785,9 +3787,9 @@@ xfs_bmap_btalloc
  	}
  	args.minleft = ap->minleft;
  	args.wasdel = ap->wasdel;
 -	args.isfl = 0;
 +	args.resv = XFS_AG_RESV_NONE;
- 	args.userdata = ap->userdata;
- 	if (ap->userdata & XFS_ALLOC_USERDATA_ZERO)
+ 	args.datatype = ap->datatype;
+ 	if (ap->datatype & XFS_ALLOC_USERDATA_ZERO)
  		args.ip = ap->ip;
  
  	error = xfs_alloc_vextent(&args);
diff --cc fs/xfs/xfs_trace.h
index c2a875fcf26e,74606cba7dba..c6b2b1dcde75
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@@ -1623,8 -1622,8 +1623,8 @@@ DECLARE_EVENT_CLASS(xfs_alloc_class
  		__field(short, otype)
  		__field(char, wasdel)
  		__field(char, wasfromfl)
 -		__field(char, isfl)
 +		__field(int, resv)
- 		__field(char, userdata)
+ 		__field(int, datatype)
  		__field(xfs_fsblock_t, firstblock)
  	),
  	TP_fast_assign(
@@@ -1644,14 -1643,14 +1644,14 @@@
  		__entry->otype = args->otype;
  		__entry->wasdel = args->wasdel;
  		__entry->wasfromfl = args->wasfromfl;
 -		__entry->isfl = args->isfl;
 +		__entry->resv = args->resv;
- 		__entry->userdata = args->userdata;
+ 		__entry->datatype = args->datatype;
  		__entry->firstblock = args->firstblock;
  	),
  	TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u "
  		  "prod %u minleft %u total %u alignment %u minalignslop %u "
 -		  "len %u type %s otype %s wasdel %d wasfromfl %d isfl %d "
 +		  "len %u type %s otype %s wasdel %d wasfromfl %d resv %d "
- 		  "userdata %d firstblock 0x%llx",
+ 		  "datatype 0x%x firstblock 0x%llx",
  		  MAJOR(__entry->dev), MINOR(__entry->dev),
  		  __entry->agno,
  		  __entry->agbno,
@@@ -1668,8 -1667,8 +1668,8 @@@
  		  __print_symbolic(__entry->otype, XFS_ALLOC_TYPES),
  		  __entry->wasdel,
  		  __entry->wasfromfl,
 -		  __entry->isfl,
 +		  __entry->resv,
- 		  __entry->userdata,
+ 		  __entry->datatype,
  		  (unsigned long long)__entry->firstblock)
  )