diff options
| author | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-03-16 15:29:49 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-03-16 15:29:49 +0500 |
| commit | eb54993a4eacffde48007bb3bcc46b664d38c403 (patch) | |
| tree | 1ef3f4cd86f9772631496a193bdeb62e25e780de /weed/filesys/wfs.go | |
| parent | 06da02739d4a97dd8288f7fa05de7cd369e97d78 (diff) | |
| parent | 9672f9e1b2ed399470e6ec877a667417c8b26870 (diff) | |
| download | seaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.tar.xz seaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.zip | |
Merge branch 'upstreamMaster' into check_chunkviews_mr
# Conflicts:
# weed/filer/filechunk_manifest.go
# weed/filer/stream.go
# weed/replication/repl_util/replication_util.go
# weed/util/fasthttp_util.go
Diffstat (limited to 'weed/filesys/wfs.go')
| -rw-r--r-- | weed/filesys/wfs.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 7c3907326..c6d9080a1 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -131,7 +131,7 @@ func NewSeaweedFileSystem(option *Option) *WFS { }) entry, _ := filer_pb.GetEntry(wfs, util.FullPath(wfs.option.FilerMountRootPath)) - wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs, entry: filer.FromPbEntry(wfs.option.FilerMountRootPath, entry)} + wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs, entry: entry} wfs.fsNodeCache = newFsCache(wfs.root) if wfs.option.ConcurrentWriters > 0 { |