block: fix error injection static_branch dec imbalance

[blktests-ci]

Pull request for series with
subject: block: fix error injection static_branch dec imbalance
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1117330

[blktests-ci]

Upstream branch: 523fc0d
series: https://patchwork.kernel.org/project/linux-block/list/?series=1117330
version: 1

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

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

conflict:

diff --cc block/error-injection.c
index cfb83138960c,d210bd5fd8fb..000000000000
--- a/block/error-injection.c
+++ b/block/error-injection.c
@@@ -118,15 -118,24 +118,32 @@@ out_free_inj
  static void error_inject_removeall(struct gendisk *disk)
  {
  	struct blk_error_inject *inj;
+ 	bool had_entries;
  
  	mutex_lock(&disk->error_injection_lock);
++<<<<<<< HEAD
 +	if (test_and_clear_bit(GD_ERROR_INJECT, &disk->state))
 +		static_branch_dec(&blk_error_injection_enabled);
++=======
+ 	had_entries = !list_empty(&disk->error_injection_list);
+ 	clear_bit(GD_ERROR_INJECT, &disk->state);
++>>>>>>> block: fix error injection static_branch dec imbalance
  	while ((inj = list_first_entry_or_null(&disk->error_injection_list,
  			struct blk_error_inject, entry))) {
  		list_del_rcu(&inj->entry);
  		kfree_rcu_mightsleep(inj);
  	}
++<<<<<<< HEAD
++=======
+ 	/*
+ 	 * blk_error_injection_exit() runs for every gendisk teardown, not
+ 	 * only for disks that configured rules.  Only adjust the global
+ 	 * static key if this disk ever contributed to it, mirroring the
+ 	 * list_empty() check in error_inject_add().
+ 	 */
+ 	if (had_entries)
+ 		static_branch_dec(&blk_error_injection_enabled);
++>>>>>>> block: fix error injection static_branch dec imbalance
  	mutex_unlock(&disk->error_injection_lock);
  }