From 05f62e5e66bbb5587de495cb489d722a941a13bb Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Mon, 17 Jul 2023 12:14:03 -0700 Subject: [PATCH] Do not hold metadataMu on gofer O_DIRECT read path. dentry.writeback() takes dataMu when it needs to. This lock seems to be unnecessary. PiperOrigin-RevId: 548763586 --- pkg/sentry/fsimpl/gofer/regular_file.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/sentry/fsimpl/gofer/regular_file.go b/pkg/sentry/fsimpl/gofer/regular_file.go index 9125cf6fd..30ee20fee 100644 --- a/pkg/sentry/fsimpl/gofer/regular_file.go +++ b/pkg/sentry/fsimpl/gofer/regular_file.go @@ -141,10 +141,6 @@ func (fd *regularFileFD) PRead(ctx context.Context, dst usermem.IOSequence, offs readErr error ) if fd.vfsfd.StatusFlags()&linux.O_DIRECT != 0 { - // Lock d.metadataMu for the rest of the read to prevent d.size from - // changing. - d.metadataMu.Lock() - defer d.metadataMu.Unlock() // Write dirty cached pages that will be touched by the read back to // the remote file. if err := d.writeback(ctx, offset, dst.NumBytes()); err != nil {