From fce9d9bf69dad72c09abc54cb45fdcfe1ffabc44 Mon Sep 17 00:00:00 2001 From: Ben McClelland Date: Fri, 28 Aug 2026 09:56:40 -0700 Subject: [PATCH] fix: build failure from conflicting merges --- backend/posix/objlock.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/posix/objlock.go b/backend/posix/objlock.go index e0ba2331..a1b2b255 100644 --- a/backend/posix/objlock.go +++ b/backend/posix/objlock.go @@ -122,7 +122,7 @@ func (p *Posix) lockObjectPublish(ctx context.Context, bucket, object string) (f func (p *Posix) openObjLockFile(bucket string, shard uint8) (*os.File, error) { name := filepath.Join(bucket, objLockDir, fmt.Sprintf("%02x", shard)) - f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.FileMode(defaultFilePerm)) + f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.FileMode(defaultNewFilePerm)) if err == nil { return f, nil } @@ -135,7 +135,7 @@ func (p *Posix) openObjLockFile(bucket string, shard uint8) (*os.File, error) { if err != nil { return nil, fmt.Errorf("make object lock dir: %w", err) } - f, err = os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.FileMode(defaultFilePerm)) + f, err = os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.FileMode(defaultNewFilePerm)) if err != nil { return nil, fmt.Errorf("open object lock file: %w", err) }