zloop: fix write pointer calculation in zloop_forget_cache

[blktests-ci]

Pull request for series with
subject: zloop: fix write pointer calculation in zloop_forget_cache
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1081024

[blktests-ci]

Upstream branch: d60bc14
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

[blktests-ci]

Upstream branch: d60bc14
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

[blktests-ci]

Upstream branch: b4e0758
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

[blktests-ci]

Upstream branch: 6596a02
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

[blktests-ci]

Upstream branch: 507bd4b
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

[blktests-ci]

Upstream branch: dd6c438
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

[blktests-ci]

Upstream branch: dd6c438
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

[blktests-ci]

Upstream branch: dca922e
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081024
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1081024
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: zloop: fix write pointer calculation in zloop_forget_cache
Using index info to reconstruct a base tree...
M	drivers/block/zloop.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/zloop.c
CONFLICT (content): Merge conflict in drivers/block/zloop.c
Patch failed at 0001 zloop: fix write pointer calculation in zloop_forget_cache'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc drivers/block/zloop.c
index 55eeb6aac0ea,672948d3653e..000000000000
--- a/drivers/block/zloop.c
+++ b/drivers/block/zloop.c
@@@ -1396,8 -1411,7 +1396,12 @@@ static void zloop_forget_cache(struct z
  		if (WARN_ON_ONCE(old_wp == ULLONG_MAX))
  			continue;
  
++<<<<<<< HEAD
 +		vfs_truncate(&file->f_path,
 +			(old_wp - zone->start) << SECTOR_SHIFT);
++=======
+ 		zloop_truncate(file, (old_wp - zone->start) << SECTOR_SHIFT);
++>>>>>>> zloop: fix write pointer calculation in zloop_forget_cache
  	}
  }