mirrors/versitygw
1
0
Fork 0
mirror of https://github.com/versity/versitygw.git synced 2026-09-27 18:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: build failure from conflicting merges

Browse Source
This commit is contained in:
Ben McClelland
2026-08-28 09:56:40 -07:00
parent 4a37af4ed3
commit fce9d9bf69
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/posix/objlock.go
+2 -2
View File
@@ -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) { func (p *Posix) openObjLockFile(bucket string, shard uint8) (*os.File, error) {
name := filepath.Join(bucket, objLockDir, fmt.Sprintf("%02x", shard)) 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 { if err == nil {
return f, nil return f, nil
} }
@@ -135,7 +135,7 @@ func (p *Posix) openObjLockFile(bucket string, shard uint8) (*os.File, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("make object lock dir: %w", err) 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 { if err != nil {
return nil, fmt.Errorf("open object lock file: %w", err) return nil, fmt.Errorf("open object lock file: %w", err)
} }