accurate limit

4 years ago · 9a195bebfd
1 changed files with 5 additions and 5 deletions
--- a/weed/filer2/filerstore.go
+++ b/weed/filer2/filerstore.go
@ -155,12 +155,11 @@ func (fsw *FilerStoreWrapper) ListDirectoryPrefixedEntries(ctx context.Context,
 						count++
 						entries = append(entries, entry)
 					}
-				}
 					if count >= limit {
-					break
+						goto Exit
 					}
-
-				notPrefixed, err = fsw.ActualStore.ListDirectoryEntries(ctx, dirPath, lastFileName, includeStartFile, limit)
+				}
+				notPrefixed, err = fsw.ActualStore.ListDirectoryEntries(ctx, dirPath, lastFileName, false, limit)
 				if err != nil {
 					return nil, err
 				}
@ -169,6 +168,7 @@ func (fsw *FilerStoreWrapper) ListDirectoryPrefixedEntries(ctx context.Context,
 					break
 				}
 			}
+		Exit:
 		}
 	} else if err != nil {
 		return nil, err