loop: add missing bd_abort_claiming in loop_set_status

[blktests-ci]

Pull request for series with
subject: loop: add missing bd_abort_claiming in loop_set_status
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1039343

[blktests-ci]

Upstream branch: 528478e
series: https://patchwork.kernel.org/project/linux-block/list/?series=1039343
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: loop: add missing bd_abort_claiming in loop_set_status
Using index info to reconstruct a base tree...
M	drivers/block/loop.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/loop.c
CONFLICT (content): Merge conflict in drivers/block/loop.c
Patch failed at 0001 loop: add missing bd_abort_claiming in loop_set_status'
  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/loop.c
index 32a3a5b13802,bd59c0e9508b..000000000000
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@@ -1232,9 -1233,20 +1232,10 @@@ loop_set_status(struct loop_device *lo
  	bool size_changed = false;
  	unsigned int memflags;
  
 -	/*
 -	 * If we don't hold exclusive handle for the device, upgrade to it
 -	 * here to avoid changing device under exclusive owner.
 -	 */
 -	if (!(mode & BLK_OPEN_EXCL)) {
 -		err = bd_prepare_to_claim(bdev, loop_set_status, NULL);
 -		if (err)
 -			goto out_reread_partitions;
 -	}
 -
  	err = mutex_lock_killable(&lo->lo_mutex);
  	if (err)
- 		return err;
+ 		goto out_abort_claiming;
+ 
  	if (lo->lo_state != Lo_bound) {
  		err = -ENXIO;
  		goto out_unlock;
@@@ -1273,6 -1285,10 +1274,13 @@@ out_unfreeze
  	}
  out_unlock:
  	mutex_unlock(&lo->lo_mutex);
++<<<<<<< HEAD
++=======
+ out_abort_claiming:
+ 	if (!(mode & BLK_OPEN_EXCL))
+ 		bd_abort_claiming(bdev, loop_set_status);
+ out_reread_partitions:
++>>>>>>> loop: add missing bd_abort_claiming in loop_set_status
  	if (partscan)
  		loop_reread_partitions(lo);
  

[blktests-ci]

Upstream branch: 28fd54b
series: https://patchwork.kernel.org/project/linux-block/list/?series=1039343
version: 1