Index: subversion/libsvn_fs_fs/cached_data.c
===================================================================
--- subversion/libsvn_fs_fs/cached_data.c	(revision 1559108)
+++ subversion/libsvn_fs_fs/cached_data.c	(working copy)
@@ -354,7 +354,6 @@ get_node_revision_body(node_revision_t **noderev_p
                              revision_file,
                              pool,
                              pool));
-          SVN_ERR(svn_fs_fs__close_revision_file(revision_file));
         }
       else
         {
@@ -373,6 +372,8 @@ get_node_revision_body(node_revision_t **noderev_p
                                    *noderev_p,
                                    pool));
         }
+
+      SVN_ERR(svn_fs_fs__close_revision_file(revision_file));
     }
 
   return SVN_NO_ERROR;
@@ -884,6 +885,7 @@ svn_fs_fs__check_rep(representation_t *rep,
       if (is_packed != rev_file.is_packed)
         {
           svn_error_clear(err);
+          SVN_ERR(svn_fs_fs__close_revision_file(&rev_file));
           return svn_error_trace(svn_fs_fs__check_rep(rep, fs, hint, pool));
         }
       else
@@ -900,6 +902,8 @@ svn_fs_fs__check_rep(representation_t *rep,
                                    " in revision %ld"),
                                  apr_off_t_toa(pool, entry->offset),
                                  rep->item_index, rep->revision);
+
+      SVN_ERR(svn_fs_fs__close_revision_file(&rev_file));
     }
   else
     {
Index: subversion/libsvn_fs_fs/pack.c
===================================================================
--- subversion/libsvn_fs_fs/pack.c	(revision 1559108)
+++ subversion/libsvn_fs_fs/pack.c	(working copy)
@@ -1426,6 +1426,8 @@ append_revision(pack_context_t *context,
   svn_pool_destroy(iterpool);
   context->pack_offset += finfo.size;
 
+  SVN_ERR(svn_fs_fs__close_revision_file(rev_file));
+
   return SVN_NO_ERROR;
 }
 
Index: subversion/libsvn_fs_fs/verify.c
===================================================================
--- subversion/libsvn_fs_fs/verify.c	(revision 1559108)
+++ subversion/libsvn_fs_fs/verify.c	(working copy)
@@ -233,6 +233,8 @@ compare_l2p_to_p2l_index(svn_fs_t *fs,
 
   svn_pool_destroy(iterpool);
 
+  SVN_ERR(svn_fs_fs__close_revision_file(&rev_file));
+
   return SVN_NO_ERROR;
 }
 
@@ -321,6 +323,8 @@ compare_p2l_to_l2p_index(svn_fs_t *fs,
 
   svn_pool_destroy(iterpool);
 
+  SVN_ERR(svn_fs_fs__close_revision_file(&rev_file));
+
   return SVN_NO_ERROR;
 }
 
@@ -576,6 +580,8 @@ compare_p2l_to_rev(svn_fs_t *fs,
 
   svn_pool_destroy(iterpool);
 
+  SVN_ERR(svn_fs_fs__close_revision_file(rev_file));
+
   return SVN_NO_ERROR;
 }