svn commit: r987512 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[da...@apache.org]

Author: danielsh
Date: Fri Aug 20 14:07:16 2010
New Revision: 987512

URL: http://svn.apache.org/viewvc?rev=987512&view=rev
Log:
Follow-up to r984990: only be paranoid when the FS is new enough to
require that.

Found by: philip

* subversion/libsvn_fs_fs/fs_fs.c
  (with_some_lock):
    Don't call update_min_unpacked_rev() and update_min_unpacked_revprop()
    on old-format filesystems.
  (set_revision_proplist):
    Drop call to update_min_unpacked_revprop(); we are under a write lock,
    so with_some_lock() will have called it.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=987512&r1=987511&r2=987512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Fri Aug 20 14:07:16 2010
@@ -599,8 +599,11 @@ with_some_lock(svn_fs_t *fs,
 
   if (!err)
     {
-      SVN_ERR(update_min_unpacked_rev(fs, pool));
-      SVN_ERR(update_min_unpacked_revprop(fs, pool));
+      fs_fs_data_t *ffd = fs->fsap_data;
+      if (ffd->format >= SVN_FS_FS__MIN_PACKED_FORMAT)
+        SVN_ERR(update_min_unpacked_rev(fs, pool));
+      if (ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
+        SVN_ERR(update_min_unpacked_revprop(fs, pool));
       err = body(baton, subpool);
     }
 
@@ -2789,7 +2792,6 @@ set_revision_proplist(svn_fs_t *fs,
 
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
 
-  SVN_ERR(update_min_unpacked_revprop(fs, pool));
   if (ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT ||
       rev >= ffd->min_unpacked_revprop)
     {