diff options
| author | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-04-12 11:22:51 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-04-12 11:22:51 +0500 |
| commit | 8e02e138ea889d9f43cc89937c02c212ca145d74 (patch) | |
| tree | 0fd5664bcd0efaff75efafdc230f45076a6c056b /weed/filesys | |
| parent | 5021bea69838a5946b4b0bfa37c6269bfe66fa27 (diff) | |
| parent | 742ab1ec81795d1705bf3be48d56727fddf625df (diff) | |
| download | seaweedfs-8e02e138ea889d9f43cc89937c02c212ca145d74.tar.xz seaweedfs-8e02e138ea889d9f43cc89937c02c212ca145d74.zip | |
Merge branch 'upstreamMaster' into iam_handlers
Diffstat (limited to 'weed/filesys')
| -rw-r--r-- | weed/filesys/dir.go | 1 | ||||
| -rw-r--r-- | weed/filesys/filehandle.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 46457f858..7b918e769 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -372,7 +372,6 @@ func (dir *Dir) Remove(ctx context.Context, req *fuse.RemoveRequest) error { return fuse.EPERM } - if !req.Dir { return dir.removeOneFile(req) } diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index 4419888c4..f04952e96 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -200,6 +200,8 @@ func (fh *FileHandle) Release(ctx context.Context, req *fuse.ReleaseRequest) err fh.Lock() defer fh.Unlock() + fh.f.entryViewCache = nil + if fh.f.isOpen <= 0 { glog.V(0).Infof("Release reset %s open count %d => %d", fh.f.Name, fh.f.isOpen, 0) fh.f.isOpen = 0 |