diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-10-08 16:18:23 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-10-08 16:18:23 +0200 |
| commit | 9d2ef27d1427ef1c61c497c272a74506d651771a (patch) | |
| tree | 48847b4dd27646a186b52b2040e2597fb179b3d8 /src/plop.erl | |
| parent | 6bceff8e5d10eff9ca59571e80a017afae347ced (diff) | |
| parent | 409ea0e5857acffe36ebc977bdce843f994a00aa (diff) | |
Merge remote-tracking branch 'refs/remotes/map/fsync4' into origin-master
Conflicts:
src/db.erl
src/plop.erl
Diffstat (limited to 'src/plop.erl')
| -rw-r--r-- | src/plop.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plop.erl b/src/plop.erl index c93b26d..30d05ca 100644 --- a/src/plop.erl +++ b/src/plop.erl @@ -146,7 +146,7 @@ handle_call({get, logid}, _From, {reply, LogID, Plop}; handle_call({add, {LogEntry, TreeLeafHash, EntryHash}}, _From, Plop) -> - {atomic, ok} = db:add(TreeLeafHash, EntryHash, LogEntry, ht:size()), + ok = db:add(TreeLeafHash, EntryHash, LogEntry, ht:size()), ok = ht:add(TreeLeafHash), {reply, ok, Plop}; |