lib/model: Partial revert of rename fix (fixes #6653) (#6656)

We can't just drop the snap because it's in use elsewhere. This should
be equally functional.

lib/model/folder.go

@@ -460,14 +460,9 @@ func (f *folder) scanSubdirs(subDirs []string) error {
 			continue
 		}
 
-		if batch.full() {
+		if err := batch.flushIfFull(); err != nil {
-			if err := batch.flush(); err != nil {
 			return err
 		}
-			snap.Release()
-			snap = f.fset.Snapshot()
-			alreadyUsed = make(map[string]struct{})
-		}
 
 		batch.append(res.File)
 		changes++