Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+26
View File
@@ -8,33 +8,45 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
Writing 512 bytes, offset is +0 (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1 byte (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1 bytes (direct=false)
read 1/1 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is +0 (direct=true)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1FSB bytes (direct=true)
read 512/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is minus 1FSB (direct=true)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1FSB bytes (direct=true)
read 513/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
=== Iterating, 2 remains
@@ -43,31 +55,39 @@ Writing 512 bytes, offset is +0 (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1 byte (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1 bytes (direct=false)
read 1/1 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is +0 (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is minus 1FSB (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
=== Iterating, 1 remains
@@ -76,31 +96,37 @@ Writing 512 bytes, offset is +0 (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1 byte (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1FSB (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1 bytes, offset is minus 1FSB (direct=false)
pwrite64: File too large
Reading 1 bytes (direct=false)
read 0/1 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is +0 (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is minus 1FSB (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
=== Iterating, 0 remains