Fix pining maps after reuse map fd

[kernel-patches-bot]

Pull request for series with
subject: Fix pining maps after reuse map fd
version: 1
url: https://patchwork.kernel.org/project/bpf/list/?series=359243

[kernel-patches-bot]

Master branch: 1028ae4
series: https://patchwork.kernel.org/project/bpf/list/?series=359243
version: 1

[kernel-patches-bot]

Master branch: b75597d
series: https://patchwork.kernel.org/project/bpf/list/?series=359243
version: 1

[kernel-patches-bot]

Master branch: 8731745
series: https://patchwork.kernel.org/project/bpf/list/?series=359243
version: 1

[kernel-patches-bot]

Master branch: 39d8f0d
series: https://patchwork.kernel.org/project/bpf/list/?series=359243
version: 1

[kernel-patches-bot]

Master branch: dca4121
series: https://patchwork.kernel.org/project/bpf/list/?series=359243
version: 1

[kernel-patches-bot]

Master branch: dca4121
series: https://patchwork.kernel.org/project/bpf/list/?series=359243
version: 1

[kernel-patches-bot]

Master branch: dca4121
series: https://patchwork.kernel.org/project/bpf/list/?series=360083
version: 1

[kernel-patches-bot]

Master branch: fd08f94
series: https://patchwork.kernel.org/project/bpf/list/?series=360083
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/bpf/list/?series=360083
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: libbpf: close map fd if init map slots failed
Using index info to reconstruct a base tree...
M	tools/lib/bpf/libbpf.c
Falling back to patching base and 3-way merge...
Auto-merging tools/lib/bpf/libbpf.c
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Patch failed at 0001 libbpf: close map fd if init map slots failed
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' to see the failed patch'

conflict:

diff --cc tools/lib/bpf/libbpf.c
index 9f90d1a686fd,c8b5fe45682d..000000000000
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@@ -4256,28 -4245,29 +4256,36 @@@ bpf_object__create_maps(struct bpf_obje
  		if (map->fd >= 0) {
  			pr_debug("map '%s': skipping creation (preset fd=%d)\n",
  				 map->name, map->fd);
 -			continue;
 -		}
 -
 -		err = bpf_object__create_map(obj, map);
 -		if (err)
 -			goto err_out;
 +		} else {
 +			err = bpf_object__create_map(obj, map);
 +			if (err)
 +				goto err_out;
  
 -		pr_debug("map '%s': created successfully, fd=%d\n", map->name,
 -			 map->fd);
++<<<<<<< HEAD
 +			pr_debug("map '%s': created successfully, fd=%d\n",
 +				 map->name, map->fd);
  
 -		if (bpf_map__is_internal(map)) {
 -			err = bpf_object__populate_internal_map(obj, map);
 -			if (err < 0) {
 -				zclose(map->fd);
 -				goto err_out;
 +			if (bpf_map__is_internal(map)) {
 +				err = bpf_object__populate_internal_map(obj, map);
 +				if (err < 0) {
 +					zclose(map->fd);
 +					goto err_out;
 +				}
  			}
 -		}
  
 +			if (map->init_slots_sz) {
 +				err = init_map_slots(map);
 +				if (err < 0) {
 +					zclose(map->fd);
 +					goto err_out;
 +				}
++=======
+ 		if (map->init_slots_sz) {
+ 			err = init_map_slots(map);
+ 			if (err < 0) {
+ 				zclose(map->fd);
+ 				goto err_out;
++>>>>>>> libbpf: close map fd if init map slots failed
  			}
  		}
  

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/bpf/list/?series=360083 irrelevant now. Closing PR.