Merge pull request #74 from chrislusf/master

sync

1 files changed, 19 insertions, 10 deletions

diff --git a/weed/filesys/dir_link.go b/weed/filesys/dir_link.go
index ba3280f03..606e52fcb 100644
--- a/weed/filesys/dir_link.go
+++ b/weed/filesys/dir_link.go
@@ -35,15 +35,20 @@ func (dir *Dir) Link(ctx context.Context, req *fuse.LinkRequest, old fs.Node) (f
 		return nil, err
 	}
 
+	oldEntry := oldFile.getEntry()
+	if oldEntry == nil {
+		return nil, fuse.EIO
+	}
+
 	// update old file to hardlink mode
-	if len(oldFile.entry.HardLinkId) == 0 {
-		oldFile.entry.HardLinkId = append(util.RandomBytes(16), HARD_LINK_MARKER)
-		oldFile.entry.HardLinkCounter = 1
+	if len(oldEntry.HardLinkId) == 0 {
+		oldEntry.HardLinkId = append(util.RandomBytes(16), HARD_LINK_MARKER)
+		oldEntry.HardLinkCounter = 1
 	}
-	oldFile.entry.HardLinkCounter++
+	oldEntry.HardLinkCounter++
 	updateOldEntryRequest := &filer_pb.UpdateEntryRequest{
 		Directory:  oldFile.dir.FullPath(),
-		Entry:      oldFile.entry,
+		Entry:      oldEntry,
 		Signatures: []int32{dir.wfs.signature},
 	}
 
@@ -53,11 +58,11 @@ func (dir *Dir) Link(ctx context.Context, req *fuse.LinkRequest, old fs.Node) (f
 		Entry: &filer_pb.Entry{
 			Name:            req.NewName,
 			IsDirectory:     false,
-			Attributes:      oldFile.entry.Attributes,
-			Chunks:          oldFile.entry.Chunks,
-			Extended:        oldFile.entry.Extended,
-			HardLinkId:      oldFile.entry.HardLinkId,
-			HardLinkCounter: oldFile.entry.HardLinkCounter,
+			Attributes:      oldEntry.Attributes,
+			Chunks:          oldEntry.Chunks,
+			Extended:        oldEntry.Extended,
+			HardLinkId:      oldEntry.HardLinkId,
+			HardLinkCounter: oldEntry.HardLinkCounter,
 		},
 		Signatures: []int32{dir.wfs.signature},
 	}
@@ -83,6 +88,10 @@ func (dir *Dir) Link(ctx context.Context, req *fuse.LinkRequest, old fs.Node) (f
 		return nil
 	})
 
+	if err != nil {
+		return nil, fuse.EIO
+	}
+
 	// create new file node
 	newNode := dir.newFile(req.NewName, request.Entry)
 	newFile := newNode.(*File)