aboutsummaryrefslogtreecommitdiff
path: root/weed/server/webdav_server.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2021-01-24 19:03:02 -0800
committerChris Lu <chris.lu@gmail.com>2021-01-24 19:03:02 -0800
commit17f7c1c43f8adc1d1e4d795f23cdf60aa0e57c95 (patch)
tree16817aa710170550530543e7b1c0f0effd2b2400 /weed/server/webdav_server.go
parent9bcb28a3eabcb2c869afc52da6b0341e8e2d8427 (diff)
parent00707ec00fb8016ac9ef8858a01a9784a6aee1a0 (diff)
downloadseaweedfs-17f7c1c43f8adc1d1e4d795f23cdf60aa0e57c95.tar.xz
seaweedfs-17f7c1c43f8adc1d1e4d795f23cdf60aa0e57c95.zip
Merge branch 'mount_from_outside_cluster'
Diffstat (limited to 'weed/server/webdav_server.go')
-rw-r--r--weed/server/webdav_server.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go
index 2b238e534..5bd92a136 100644
--- a/weed/server/webdav_server.go
+++ b/weed/server/webdav_server.go
@@ -123,9 +123,6 @@ func (fs *WebDavFileSystem) WithFilerClient(fn func(filer_pb.SeaweedFilerClient)
}, fs.option.FilerGrpcAddress, fs.option.GrpcDialOption)
}
-func (fs *WebDavFileSystem) AdjustedUrl(location *filer_pb.Location) string {
- return location.Url
-}
func clearName(name string) (string, error) {
slashed := strings.HasSuffix(name, "/")
@@ -523,7 +520,7 @@ func (f *WebDavFile) Read(p []byte) (readSize int, err error) {
}
if f.reader == nil {
chunkViews := filer.ViewFromVisibleIntervals(f.entryViewCache, 0, math.MaxInt64)
- f.reader = filer.NewChunkReaderAtFromClient(f.fs, chunkViews, f.fs.chunkCache, fileSize)
+ f.reader = filer.NewChunkReaderAtFromClient(filer.LookupFn(f.fs), chunkViews, f.fs.chunkCache, fileSize)
}
readSize, err = f.reader.ReadAt(p, f.off)