parent
b43a5b9051
commit
0106f54ff0
|
@ -696,7 +696,8 @@ static s64 ntfs_device_win32_read(struct ntfs_device *dev, void *buf, s64 count)
|
|||
numtoread.QuadPart = ((count + offset.QuadPart - 1) | 0x1FF) + 1;
|
||||
|
||||
Dprintf("win32_read(fd=%p,b=%p,count=0x%llx)->(%llx+%llx:%llx)\n", fd,
|
||||
buf, count, base, offset, numtoread);
|
||||
buf, count, base.QuadPart, offset.QuadPart,
|
||||
numtoread.QuadPart);
|
||||
|
||||
#ifndef FORCE_ALIGNED_READ
|
||||
if (((((long)buf) & ((s64)0x1FF)) == 0) && ((count & ((s64)0x1FF)) == 0)
|
||||
|
@ -834,7 +835,7 @@ static s64 ntfs_device_win32_write(struct ntfs_device *dev, const void *buf,
|
|||
s64 bytes_written = 0;
|
||||
HANDLE handle = ((win32_fd *)dev->d_private)->handle;
|
||||
|
||||
Dprintf("win32_write: Writing %ll bytes\n",count);
|
||||
Dprintf("win32_write: Writing %lld bytes\n",count);
|
||||
|
||||
if (NDevReadOnly(dev)) {
|
||||
Dputs("win32_write: Device R/O, exiting.");
|
||||
|
@ -849,7 +850,8 @@ static s64 ntfs_device_win32_write(struct ntfs_device *dev, const void *buf,
|
|||
|
||||
if (WriteFile(handle, buf, cur_count, &cur_written, NULL) &&
|
||||
(cur_written==cur_count)) {
|
||||
Dprintf("win32_write: Written %u bytes.",bytes_written);
|
||||
Dprintf("win32_write: Written %lld bytes.\n",
|
||||
bytes_written);
|
||||
bytes_written += cur_written;
|
||||
count -= cur_written;
|
||||
} else {
|
||||
|
|
|
@ -731,9 +731,9 @@ static void walk_runs(struct ntfs_walk_cluster *walk)
|
|||
for (j = 0; j < lcn_length; j++) {
|
||||
u64 k = (u64)lcn + j;
|
||||
if (ntfs_bit_get_and_set(lcn_bitmap.bm, k, 1))
|
||||
err_exit("Cluster %lu referenced twice!\n"
|
||||
err_exit("Cluster %llu referenced twice!\n"
|
||||
"You didn't shutdown your Windows"
|
||||
"properly?\n", k);
|
||||
"properly?\n", (unsigned long long)k);
|
||||
}
|
||||
|
||||
walk->image->inuse += lcn_length;
|
||||
|
|
|
@ -1140,10 +1140,12 @@ static void replace_attribute_runlist(ntfs_volume *vol,
|
|||
|
||||
if (le32_to_cpu(ctx->mrec->bytes_in_use) + l >
|
||||
le32_to_cpu(ctx->mrec->bytes_allocated))
|
||||
err_exit("Extended record needed (%d > %d), not yet "
|
||||
err_exit("Extended record needed (%u > %u), not yet "
|
||||
"supported!\nPlease try to free less space.\n",
|
||||
le32_to_cpu(ctx->mrec->bytes_in_use) + l,
|
||||
le32_to_cpu(ctx->mrec->bytes_allocated));
|
||||
(unsigned int)le32_to_cpu(ctx->mrec->
|
||||
bytes_in_use) + l,
|
||||
(unsigned int)le32_to_cpu(ctx->mrec->
|
||||
bytes_allocated));
|
||||
|
||||
memmove(next_attr + l, next_attr, remains_size);
|
||||
ctx->mrec->bytes_in_use = cpu_to_le32(l +
|
||||
|
|
|
@ -3997,7 +3997,8 @@ static int ntfs_index_dump_alloc (ntfs_attr *attr, VCN vcn, int indent)
|
|||
break;
|
||||
}
|
||||
printf ("%.*s", indent, space_line);
|
||||
printf ("fill = %d/%d\n", block->index.index_length, block->index.allocated_size);
|
||||
printf ("fill = %u/%u\n", (unsigned int)block->index.index_length,
|
||||
(unsigned int)block->index.allocated_size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue