gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nil problem

Browse Source
This commit is contained in:
Chris Lu
2019-12-10 23:13:14 -08:00
parent 356bd1b629
commit 40ff4eea14
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/filer2/filer_client_util.go
View File

@@ -112,11 +112,12 @@ func GetEntry(ctx context.Context, filerClient FilerClient, fullFilePath string)
return err return err
} }
if resp.Entry != nil { if resp.Entry == nil {
entry = resp.Entry
glog.V(3).Infof("read %s entry: %v", fullFilePath, entry) glog.V(3).Infof("read %s entry: %v", fullFilePath, entry)
return nil
} }
entry = resp.Entry
return nil return nil
}) })

3
weed/filesys/dir.go
View File

@@ -56,6 +56,9 @@ func (dir *Dir) Attr(ctx context.Context, attr *fuse.Attr) error {
glog.V(2).Infof("read dir %s attr: %v, error: %v", dir.Path, dir.attributes, err) glog.V(2).Infof("read dir %s attr: %v, error: %v", dir.Path, dir.attributes, err)
return err return err
} }
if entry == nil {
return fuse.ENOENT
}
dir.attributes = entry.Attributes dir.attributes = entry.Attributes
glog.V(2).Infof("dir %s: %v perm: %v", dir.Path, dir.attributes, os.FileMode(dir.attributes.FileMode)) glog.V(2).Infof("dir %s: %v perm: %v", dir.Path, dir.attributes, os.FileMode(dir.attributes.FileMode))