svn commit: r1462402 - /subversion/branches/verify-at-commit/subversion/libsvn_fs/fs-loader.c

[da...@apache.org]

Author: danielsh
Date: Fri Mar 29 05:19:03 2013
New Revision: 1462402

URL: http://svn.apache.org/r1462402
Log:
On the verify-at-commit branch, remove the in-trunk now-obsolete implementation,
and simplify code.

* subversion/libsvn_fs/fs-loader.c
  (svn_fs_commit_txn): Don't verify, compute 'fs' more simply.

Modified:
    subversion/branches/verify-at-commit/subversion/libsvn_fs/fs-loader.c

Modified: subversion/branches/verify-at-commit/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/verify-at-commit/subversion/libsvn_fs/fs-loader.c?rev=1462402&r1=1462401&r2=1462402&view=diff
==============================================================================
--- subversion/branches/verify-at-commit/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/verify-at-commit/subversion/libsvn_fs/fs-loader.c Fri Mar 29 05:19:03 2013
@@ -758,24 +758,11 @@ svn_fs_commit_txn(const char **conflict_
                   svn_fs_txn_t *txn, apr_pool_t *pool)
 {
   svn_error_t *err;
-#if defined(PACK_AFTER_EVERY_COMMIT) || defined(SVN_DEBUG)
-  svn_fs_root_t *txn_root;
-#endif
 
   *new_rev = SVN_INVALID_REVNUM;
   if (conflict_p)
     *conflict_p = NULL;
 
-#if defined(PACK_AFTER_EVERY_COMMIT) || defined(SVN_DEBUG)
-  SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
-#endif
-
-#ifdef SVN_DEBUG
-  /* ### TODO: add db/fs.conf with a knob to enable this in release builds */
-  /* ### TODO: should this run just before incrementing 'current'? */
-  SVN_ERR(svn_fs_verify_root(txn_root, pool));
-#endif
-
   err = txn->vtable->commit(conflict_p, new_rev, txn, pool);
 
 #ifdef SVN_DEBUG
@@ -794,7 +781,7 @@ svn_fs_commit_txn(const char **conflict_
 
 #ifdef PACK_AFTER_EVERY_COMMIT
   {
-    svn_fs_t *fs = svn_fs_root_fs(txn_root);
+    svn_fs_t *fs = txn->fs;
     const char *fs_path = svn_fs_path(fs, pool);
     err = svn_fs_pack(fs_path, NULL, NULL, NULL, NULL, pool);
     if (err && err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)