Author: stefan2
Date: Tue Oct 11 20:10:04 2011
New Revision: 1182061
URL: http://svn.apache.org/viewvc?rev=1182061&view=rev
Log:
On svn_mutex branch:
Switch one remaining function to the safer SVN_MUTEX__WITH_LOCK macro.
That code had been added to /trunk after creating this branch.
* subversion/libsvn_fs/fs-loader.c
(svn_fs_upgrade): simplify using the new macro
Modified:
subversion/branches/svn_mutex/subversion/libsvn_fs/fs-loader.c
Modified: subversion/branches/svn_mutex/subversion/libsvn_fs/fs-loader.c
URL:
http://svn.apache.org/viewvc/subversion/branches/svn_mutex/subversion/libsvn_fs/fs-loader.c?rev=1182061&r1=1182060&r2=1182061&view=diff
==============================================================================
--- subversion/branches/svn_mutex/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/svn_mutex/subversion/libsvn_fs/fs-loader.c Tue Oct 11
20:10:04 2011
@@ -403,16 +403,11 @@ svn_fs_verify(const char *path,
SVN_ERR(fs_library_vtable(&vtable, path, pool));
fs = fs_new(NULL, pool);
- SVN_ERR(acquire_fs_mutex());
- err = vtable->verify_fs(fs, path, cancel_func, cancel_baton,
- pool, common_pool);
- err2 = release_fs_mutex();
- if (err)
- {
- svn_error_clear(err2);
- return svn_error_trace(err);
- }
- return svn_error_trace(err2);
+
+ SVN_MUTEX__WITH_LOCK(common_pool_lock,
+ vtable->verify_fs(fs, path, cancel_func, cancel_baton,
+ pool, common_pool));
+ return SVN_NO_ERROR;
}
const char *
