1 files changed, 7 insertions, 28 deletions

diff --git a/pkg/sentry/vfs/lock.go b/pkg/sentry/vfs/lock.go
index bcff35792..cbe4d8c2d 100644
--- a/pkg/sentry/vfs/lock.go
+++ b/pkg/sentry/vfs/lock.go
@@ -39,8 +39,8 @@ type FileLocks struct {
 }
 
 // LockBSD tries to acquire a BSD-style lock on the entire file.
-func (fl *FileLocks) LockBSD(uid fslock.UniqueID, t fslock.LockType, block fslock.Blocker) error {
-	if fl.bsd.LockRegion(uid, t, fslock.LockRange{0, fslock.LockEOF}, block) {
+func (fl *FileLocks) LockBSD(ctx context.Context, uid fslock.UniqueID, ownerID int32, t fslock.LockType, block fslock.Blocker) error {
+	if fl.bsd.LockRegion(uid, ownerID, t, fslock.LockRange{0, fslock.LockEOF}, block) {
 		return nil
 	}
 
@@ -61,8 +61,8 @@ func (fl *FileLocks) UnlockBSD(uid fslock.UniqueID) {
 }
 
 // LockPOSIX tries to acquire a POSIX-style lock on a file region.
-func (fl *FileLocks) LockPOSIX(ctx context.Context, uid fslock.UniqueID, t fslock.LockType, r fslock.LockRange, block fslock.Blocker) error {
-	if fl.posix.LockRegion(uid, t, r, block) {
+func (fl *FileLocks) LockPOSIX(ctx context.Context, uid fslock.UniqueID, ownerPID int32, t fslock.LockType, r fslock.LockRange, block fslock.Blocker) error {
+	if fl.posix.LockRegion(uid, ownerPID, t, r, block) {
 		return nil
 	}
 
@@ -83,28 +83,7 @@ func (fl *FileLocks) UnlockPOSIX(ctx context.Context, uid fslock.UniqueID, r fsl
 	return nil
 }
 
-func computeRange(ctx context.Context, fd *FileDescription, start uint64, length uint64, whence int16) (fslock.LockRange, error) {
-	var off int64
-	switch whence {
-	case linux.SEEK_SET:
-		off = 0
-	case linux.SEEK_CUR:
-		// Note that Linux does not hold any mutexes while retrieving the file
-		// offset, see fs/locks.c:flock_to_posix_lock and fs/locks.c:fcntl_setlk.
-		curOff, err := fd.Seek(ctx, 0, linux.SEEK_CUR)
-		if err != nil {
-			return fslock.LockRange{}, err
-		}
-		off = curOff
-	case linux.SEEK_END:
-		stat, err := fd.Stat(ctx, StatOptions{Mask: linux.STATX_SIZE})
-		if err != nil {
-			return fslock.LockRange{}, err
-		}
-		off = int64(stat.Size)
-	default:
-		return fslock.LockRange{}, syserror.EINVAL
-	}
-
-	return fslock.ComputeRange(int64(start), int64(length), off)
+// TestPOSIX returns information about whether the specified lock can be held, in the style of the F_GETLK fcntl.
+func (fl *FileLocks) TestPOSIX(ctx context.Context, uid fslock.UniqueID, t fslock.LockType, r fslock.LockRange) (linux.Flock, error) {
+	return fl.posix.TestRegion(ctx, uid, t, r), nil
 }