Merge release-20210510.0-38-g894187b2c (automated)

1 files changed, 8 insertions, 0 deletions

diff --git a/pkg/sentry/vfs/file_description.go b/pkg/sentry/vfs/file_description.go
index 176bcc242..ef8d8a813 100644
--- a/pkg/sentry/vfs/file_description.go
+++ b/pkg/sentry/vfs/file_description.go
@@ -454,6 +454,9 @@ type FileDescriptionImpl interface {
 	// RemoveXattr removes the given extended attribute from the file.
 	RemoveXattr(ctx context.Context, name string) error
 
+	// SupportsLocks indicates whether file locks are supported.
+	SupportsLocks() bool
+
 	// LockBSD tries to acquire a BSD-style advisory file lock.
 	LockBSD(ctx context.Context, uid lock.UniqueID, ownerPID int32, t lock.LockType, block lock.Blocker) error
 
@@ -818,6 +821,11 @@ func (fd *FileDescription) Msync(ctx context.Context, mr memmap.MappableRange) e
 	return fd.Sync(ctx)
 }
 
+// SupportsLocks indicates whether file locks are supported.
+func (fd *FileDescription) SupportsLocks() bool {
+	return fd.impl.SupportsLocks()
+}
+
 // LockBSD tries to acquire a BSD-style advisory file lock.
 func (fd *FileDescription) LockBSD(ctx context.Context, ownerPID int32, lockType lock.LockType, blocker lock.Blocker) error {
 	atomic.StoreUint32(&fd.usedLockBSD, 1)