Merge pull request #124 from willscott/fix/on-remove-invalidation

willscott · web-flow · commit 1270feec7a33 · 2024-01-24T17:40:51.000+01:00
invalidate the specific item being removed
diff --git a/nfs_onremove.go b/nfs_onremove.go
@@ -45,6 +45,7 @@ func onRemove(ctx context.Context, w *response, userHandle Handler) error {
 	preCacheData := ToFileAttribute(dirInfo, fullPath).AsCache()
 
 	toDelete := fs.Join(append(path, string(obj.Filename))...)
+	toDeleteHandle := userHandle.ToHandle(fs, append(path, string(obj.Filename)))
 
 	err = fs.Remove(toDelete)
 	if err != nil {
@@ -57,7 +58,7 @@ func onRemove(ctx context.Context, w *response, userHandle Handler) error {
 		return &NFSStatusError{NFSStatusIO, err}
 	}
 
-	if err := userHandle.InvalidateHandle(fs, obj.Handle); err != nil {
+	if err := userHandle.InvalidateHandle(fs, toDeleteHandle); err != nil {
 		return &NFSStatusError{NFSStatusServerFault, err}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func onRemove(ctx context.Context, w *response, userHandle Handler) error {`
`45`	`45`	`preCacheData := ToFileAttribute(dirInfo, fullPath).AsCache()`
`46`	`46`
`47`	`47`	`toDelete := fs.Join(append(path, string(obj.Filename))...)`
	`48`	`+ toDeleteHandle := userHandle.ToHandle(fs, append(path, string(obj.Filename)))`
`48`	`49`
`49`	`50`	`err = fs.Remove(toDelete)`
`50`	`51`	`if err != nil {`
`@@ -57,7 +58,7 @@ func onRemove(ctx context.Context, w *response, userHandle Handler) error {`
`57`	`58`	`return &NFSStatusError{NFSStatusIO, err}`
`58`	`59`	`}`
`59`	`60`
`60`		`- if err := userHandle.InvalidateHandle(fs, obj.Handle); err != nil {`
	`61`	`+ if err := userHandle.InvalidateHandle(fs, toDeleteHandle); err != nil {`
`61`	`62`	`return &NFSStatusError{NFSStatusServerFault, err}`
`62`	`63`	`}`
`63`	`64`