src/bindings: introduce free_initpid() helper

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

Author: mihalicyn

src/bindings.c

@@ -192,6 +192,12 @@ static bool initpid_still_valid(struct pidns_store *entry)
 	return ret == 1;
 }
 
+static void free_initpid(struct pidns_store *entry)
+{
+	close_prot_errno_disarm(entry->init_pidfd);
+	free_disarm(entry);
+}
+
 /* Must be called under store_lock */
 static void remove_initpid(struct pidns_store *entry)
 {
@@ -207,17 +213,15 @@ static void remove_initpid(struct pidns_store *entry)
 	ino_hash = HASH(entry->ino);
 	if (pidns_hash_table[ino_hash] == entry) {
 		pidns_hash_table[ino_hash] = entry->next;
-		close_prot_errno_disarm(entry->init_pidfd);
-		free_disarm(entry);
+		free_initpid(entry);
 		return;
 	}
 
 	it = pidns_hash_table[ino_hash];
 	while (it) {
 		if (it->next == entry) {
 			it->next = entry->next;
-			close_prot_errno_disarm(entry->init_pidfd);
-			free_disarm(entry);
+			free_initpid(entry);
 			return;
 		}
 		it = it->next;
@@ -267,8 +271,7 @@ static void prune_initpid_store(void)
 				else
 					pidns_hash_table[i] = entry->next;
 				entry = entry->next;
-				close_prot_errno_disarm(cur->init_pidfd);
-				free_disarm(cur);
+				free_initpid(cur);
 			} else {
 				lxcfs_debug("Kept cache entry for pid %d in init pid cache", cur->initpid);
 
@@ -302,8 +305,7 @@ static void clear_initpid_store(void)
 				else
 					pidns_hash_table[i] = entry->next;
 				entry = entry->next;
-				close_prot_errno_disarm(cur->init_pidfd);
-				free_disarm(cur);
+				free_initpid(cur);
 			}
 		}
 	}