From 0f653d21531b063e9f828d9eac94e4c909f311d2 Mon Sep 17 00:00:00 2001 From: Chengyu Liu Date: Sun, 16 Apr 2023 13:15:16 +0800 Subject: [PATCH] update fuse client log which should output the fh of FileHandle. (#4404) --- weed/mount/filehandle.go | 1 - weed/mount/weedfs_file_sync.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/weed/mount/filehandle.go b/weed/mount/filehandle.go index fe038a258..6513d96ba 100644 --- a/weed/mount/filehandle.go +++ b/weed/mount/filehandle.go @@ -27,7 +27,6 @@ type FileHandle struct { dirtyPages *PageWriter reader *filer.ChunkReadAt contentType string - handle uint64 sync.RWMutex isDeleted bool diff --git a/weed/mount/weedfs_file_sync.go b/weed/mount/weedfs_file_sync.go index 8b67f85c1..4254e3830 100644 --- a/weed/mount/weedfs_file_sync.go +++ b/weed/mount/weedfs_file_sync.go @@ -96,7 +96,7 @@ func (wfs *WFS) doFlush(fh *FileHandle, uid, gid uint32) fuse.Status { fileFullPath := fh.FullPath() dir, name := fileFullPath.DirAndName() // send the data to the OS - glog.V(4).Infof("doFlush %s fh %d", fileFullPath, fh.handle) + glog.V(4).Infof("doFlush %s fh %d", fileFullPath, fh.fh) if !wfs.IsOverQuota { if err := fh.dirtyPages.FlushData(); err != nil { @@ -177,7 +177,7 @@ func (wfs *WFS) doFlush(fh *FileHandle, uid, gid uint32) fuse.Status { } if err != nil { - glog.Errorf("%v fh %d flush: %v", fileFullPath, fh.handle, err) + glog.Errorf("%v fh %d flush: %v", fileFullPath, fh.fh, err) return fuse.EIO }