diff --git a/cfg.mk b/cfg.mk
index f6f1ce25..0eb05b89 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,8 +31,12 @@ sc_glnx_errno_prefix_colon:
 	@prohibit='\<glnx_throw_errno_prefix *\(.*: ",' halt="don't add trailing : for glnx_throw_errno_prefix"	\
 	  $(_sc_search_regexp)
 
+sc_glnx_no_fd_close:
+	@prohibit='\<glnx_fd_close int' halt="Use glnx_autofd, not glnx_fd_close"	\
+	  $(_sc_search_regexp)
+
 #SHELL=bash -x
 show-vc-list-except:
 	@$(VC_LIST_EXCEPT)
 
-VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk|*.gpg|*.sig|.xz$$
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|cfg.mk|maint.mk|*.gpg|*.sig|.xz$$
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 164003f7..e1649c1d 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -821,7 +821,7 @@ adopt_and_commit_regfile (OstreeRepo   *self,
   ot_checksum_init (&hasher);
   ot_checksum_update_bytes (&hasher, header);
 
-  glnx_fd_close int fd = -1;
+  glnx_autofd int fd = -1;
   if (!glnx_openat_rdonly (dfd, name, FALSE, &fd, error))
     return FALSE;