remove duplicated smgrclose

Steven Niu · Commitfest Bot · commit 0901b7c54fc3 · 2025-04-02T18:49:23.000Z
Remove redundant `smgrclose` calls after `smgrdounlinkall`. The `smgrdounlinkall` now handles all necessary cleanup, making additional closes unnecessary. Author: Steven Niu <niushiji@gmail.com> Reviewed-by: Junwang Zhao Discussion: https://www.postgresql.org/message-id/flat/CABBtG=cDTCBDCBK7McSy6bJR3s5xUTOg0vSFfuW8oLdUYyCscA@mail.gmail.com
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
@@ -727,9 +727,6 @@ smgrDoPendingDeletes(bool isCommit)
 	{
 		smgrdounlinkall(srels, nrels, false);
 
-		for (int i = 0; i < nrels; i++)
-			smgrclose(srels[i]);
-
 		pfree(srels);
 	}
 }
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
@@ -1606,8 +1606,6 @@ DropRelationFiles(RelFileLocator *delrels, int ndelrels, bool isRedo)
 
 	smgrdounlinkall(srels, ndelrels, isRedo);
 
-	for (i = 0; i < ndelrels; i++)
-		smgrclose(srels[i]);
 	pfree(srels);
 }
 
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
@@ -3802,7 +3802,6 @@ RelationSetNewRelfilenumber(Relation relation, char persistence)
 		 */
 		srel = smgropen(relation->rd_locator, relation->rd_backend);
 		smgrdounlinkall(&srel, 1, false);
-		smgrclose(srel);
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -727,9 +727,6 @@ smgrDoPendingDeletes(bool isCommit)`
`727`	`727`	`{`
`728`	`728`	`smgrdounlinkall(srels, nrels, false);`
`729`	`729`
`730`		`- for (int i = 0; i < nrels; i++)`
`731`		`- smgrclose(srels[i]);`
`732`		`-`
`733`	`730`	`pfree(srels);`
`734`	`731`	`}`
`735`	`732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1606,8 +1606,6 @@ DropRelationFiles(RelFileLocator *delrels, int ndelrels, bool isRedo)`
`1606`	`1606`
`1607`	`1607`	`smgrdounlinkall(srels, ndelrels, isRedo);`
`1608`	`1608`
`1609`		`- for (i = 0; i < ndelrels; i++)`
`1610`		`- smgrclose(srels[i]);`
`1611`	`1609`	`pfree(srels);`
`1612`	`1610`	`}`
`1613`	`1611`
Original file line number	Diff line number	Diff line change
`@@ -3802,7 +3802,6 @@ RelationSetNewRelfilenumber(Relation relation, char persistence)`
`3802`	`3802`	`*/`
`3803`	`3803`	`srel = smgropen(relation->rd_locator, relation->rd_backend);`
`3804`	`3804`	`smgrdounlinkall(&srel, 1, false);`
`3805`		`- smgrclose(srel);`
`3806`	`3805`	`}`
`3807`	`3806`	`else`
`3808`	`3807`	`{`