Skip to content

file_scan: handle sparse files with a trailing hole (#374) #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martinus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

file_scan: handle sparse files with a trailing hole (#374) #411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions file_scan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,15 +887,18 @@ static int process_extents(struct scan_ctxt *ctxt, struct buffer *buffer,
while (file_off < ctxt->off + bytes) {
extent = get_extent(ctxt->fiemap, file_off, NULL);
if (!extent) {
eprintf("process_extents: unable to get extent\n");

/* Cleanup the partial checksum and skip
* the rest of the buffer
/*
* No extent covers this offset: we've walked past the
* last mapped extent into a trailing hole (data followed
* by a hole up to EOF, which FIEMAP never reports). That
* is not an error - finish the pending checksum and stop
* cleanly. Treating it as a failure made the caller
* declare the file "changed" and never hash or dedupe it.
*/
if (ctxt->extent_csum)
finish_running_checksum(ctxt->extent_csum, NULL);
ctxt->extent_csum = NULL;
return 1;
return 0;
}

ext_end_off = extent->fe_logical + extent->fe_length;
Expand Down Expand Up @@ -929,7 +932,8 @@ static int process_extents(struct scan_ctxt *ctxt, struct buffer *buffer,
* the part that will never exist.
*/
size_t dummy = 0;
if (extent->fe_flags & FIEMAP_EXTENT_LAST)
if ((extent->fe_flags & FIEMAP_EXTENT_LAST) &&
ext_end_off > ctxt->filesize)
dummy = ext_end_off - ctxt->filesize;
if (file_off + dummy == ext_end_off) {
ret = store_extent(ctxt, hashes, extent);
Expand Down