From ae5433c4caf0ee57e3338df6dcd625f20ece7101 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 May 2015 16:23:07 -0400 Subject: use lock pools throughout git-annex The one exception is in Utility.Daemon. As long as a process only daemonizes once, which seems reasonable, and as long as it avoids calling checkDaemon once it's already running as a daemon, the fcntl locking gotchas won't be a problem there. Annex.LockFile has it's own separate lock pool layer, which has been renamed to LockCache. This is a persistent cache of locks that persist until closed. This is not quite done; lockContent stil needs to be converted. --- Database/Fsck.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Database') diff --git a/Database/Fsck.hs b/Database/Fsck.hs index 50c08cf61..d9416927b 100644 --- a/Database/Fsck.hs +++ b/Database/Fsck.hs @@ -74,7 +74,7 @@ openDb u = do liftIO $ do void $ tryIO $ removeDirectoryRecursive dbdir rename tmpdbdir dbdir - lockFileShared =<< fromRepo (gitAnnexFsckDbLock u) + lockFileCached =<< fromRepo (gitAnnexFsckDbLock u) h <- liftIO $ H.openDb db "fscked" return $ FsckHandle h u -- cgit v1.2.3