diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-23 10:35:29 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-23 10:35:29 -0700 |
| commit | ca1a5457ae3ce8043170a052cc841e6c73023fd6 (patch) | |
| tree | b538f217f2c03209e5f7a999fab026d48e841845 /weed/mount/weedfs_file_copy_range.go | |
| parent | 186b1f029bcd67840803d8b611c571c186f52680 (diff) | |
| download | seaweedfs-origin/test-reverting-lock-table.tar.xz seaweedfs-origin/test-reverting-lock-table.zip | |
only revert lock tableorigin/test-reverting-lock-table
Diffstat (limited to 'weed/mount/weedfs_file_copy_range.go')
| -rw-r--r-- | weed/mount/weedfs_file_copy_range.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/weed/mount/weedfs_file_copy_range.go b/weed/mount/weedfs_file_copy_range.go index 43ec289ab..49bab17f3 100644 --- a/weed/mount/weedfs_file_copy_range.go +++ b/weed/mount/weedfs_file_copy_range.go @@ -1,7 +1,6 @@ package mount import ( - "github.com/seaweedfs/seaweedfs/weed/util" "net/http" "time" @@ -45,16 +44,16 @@ func (wfs *WFS) CopyFileRange(cancel <-chan struct{}, in *fuse.CopyFileRangeIn) } // lock source and target file handles - fhOutActiveLock := fhOut.wfs.fhLockTable.AcquireLock("CopyFileRange", fhOut.fh, util.ExclusiveLock) - defer fhOut.wfs.fhLockTable.ReleaseLock(fhOut.fh, fhOutActiveLock) + fhOut.Lock() + defer fhOut.Unlock() if fhOut.entry == nil { return 0, fuse.ENOENT } if fhIn.fh != fhOut.fh { - fhInActiveLock := fhIn.wfs.fhLockTable.AcquireLock("CopyFileRange", fhIn.fh, util.SharedLock) - defer fhIn.wfs.fhLockTable.ReleaseLock(fhIn.fh, fhInActiveLock) + fhIn.RLock() + defer fhIn.RUnlock() } // directories are not supported |