diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 14:10:39 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 14:10:39 -0400 |
| commit | d287f769f5065448c48c50351117f67f83347eaf (patch) | |
| tree | b9cc16a4b16cfefea398c1f7c763cb425607e699 | |
| parent | 8a25170d527da072f4c7e8fcd41ffa64a9a59b9c (diff) | |
| download | longterm-queue-4.8-d287f769f5065448c48c50351117f67f83347eaf.tar.gz | |
xfs: patch refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/xfs-tune-down-agno-asserts-in-the-bmap-code.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queue/xfs-tune-down-agno-asserts-in-the-bmap-code.patch b/queue/xfs-tune-down-agno-asserts-in-the-bmap-code.patch index 6d7264f..87b054c 100644 --- a/queue/xfs-tune-down-agno-asserts-in-the-bmap-code.patch +++ b/queue/xfs-tune-down-agno-asserts-in-the-bmap-code.patch @@ -1,4 +1,4 @@ -From 410d17f67e583559be3a922f8b6cc336331893f3 Mon Sep 17 00:00:00 2001 +From 3272fe37f09836d809b58ff00c0c48310df3e8c0 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig <hch@lst.de> Date: Thu, 16 Feb 2017 17:12:51 -0800 Subject: [PATCH] xfs: tune down agno asserts in the bmap code @@ -25,10 +25,10 @@ Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c -index 2ae55db8c977..a9c66d47757a 100644 +index fbc46ef02ff3..a9d3fcc35ca7 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c -@@ -798,9 +798,7 @@ try_another_ag: +@@ -766,9 +766,7 @@ xfs_bmap_extents_to_btree( */ ASSERT(args.fsbno != NULLFSBLOCK); ASSERT(*firstblock == NULLFSBLOCK || @@ -39,7 +39,7 @@ index 2ae55db8c977..a9c66d47757a 100644 *firstblock = cur->bc_private.b.firstblock = args.fsbno; cur->bc_private.b.allocated++; ip->i_d.di_nblocks++; -@@ -3822,17 +3820,13 @@ xfs_bmap_btalloc( +@@ -3841,17 +3839,13 @@ xfs_bmap_btalloc( * the first block that was allocated. */ ASSERT(*ap->firstblock == NULLFSBLOCK || @@ -58,9 +58,9 @@ index 2ae55db8c977..a9c66d47757a 100644 - (ap->dfops->dop_low && fb_agno < args.agno)); + ASSERT(nullfb || fb_agno <= args.agno); ap->length = args.len; - if (!(ap->flags & XFS_BMAPI_COWFORK)) - ap->ip->i_d.di_nblocks += args.len; -@@ -4754,13 +4748,9 @@ error0: + ap->ip->i_d.di_nblocks += args.len; + xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE); +@@ -4678,13 +4672,9 @@ error0: if (bma.cur) { if (!error) { ASSERT(*firstblock == NULLFSBLOCK || |