[ARVADOS] updated: 12e80e523f1178c0db49a3c9d856d17bb7855dfe

[git at public.curoverse.com]

Summary of changes:
 services/keepstore/handlers.go    | 2 +-
 services/keepstore/volume.go      | 2 +-
 services/keepstore/volume_unix.go | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

       via  12e80e523f1178c0db49a3c9d856d17bb7855dfe (commit)
      from  56d363875a42c1abd485c67e030f625299548aa0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 12e80e523f1178c0db49a3c9d856d17bb7855dfe
Author: Tim Pierce <twp at curoverse.com>
Date:   Thu Aug 21 14:25:29 2014 -0400

    3448: minor bugfixes
    
    Refs #3448.

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 468eec4..1c55bb3 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -504,7 +504,7 @@ func PutBlock(block []byte, hash string) error {
 			// there are at least N *writable* replicas, so a block
 			// that cannot be written to should not count toward the
 			// replication total.
-			return TouchBlock(block)
+			return TouchBlock(hash)
 		} else {
 			return CollisionError
 		}
diff --git a/services/keepstore/volume.go b/services/keepstore/volume.go
index 7d791f2..fbf63b7 100644
--- a/services/keepstore/volume.go
+++ b/services/keepstore/volume.go
@@ -55,7 +55,7 @@ func (v *MockVolume) Put(loc string, block []byte) error {
 		return errors.New("Bad volume")
 	}
 	v.Store[loc] = block
-	return Touch(loc)
+	return v.Touch(loc)
 }
 
 func (v *MockVolume) Touch(loc string) error {
diff --git a/services/keepstore/volume_unix.go b/services/keepstore/volume_unix.go
index e137045..6960098 100644
--- a/services/keepstore/volume_unix.go
+++ b/services/keepstore/volume_unix.go
@@ -328,10 +328,10 @@ func (v *UnixVolume) String() string {
 }
 
 // lockfile and unlockfile use flock(2) to manage kernel file locks.
-func lockfile(f os.File) error {
+func lockfile(f *os.File) error {
 	return syscall.Flock(int(f.Fd()), syscall.LOCK_EX)
 }
 
-func unlockfile(f os.File) error {
+func unlockfile(f *os.File) error {
 	return syscall.Flock(int(f.Fd()), syscall.LOCK_UN)
 }

-----------------------------------------------------------------------


hooks/post-receive
--