rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle correctly files without offset

Browse source 
This avoid the warnings about duplicate offsets.
This commit is contained in:
Andrea Mazzoleni 2015-12-20 17:19:57 +01:00
parent 06e0954d5e
commit 584c362ba4
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
HISTORY
View file

@ -6,6 +6,9 @@ SnapRAID HISTORY
* Fixes support for symlinks pointing to an empty target. Before they
were only partially supported, and their presence could result in
a content file not readable.
* Improves the physical offset ordering for the Btrfs filesystem,
correctly detecting files that have not a physical offset, for
whatever reason.
* Adds UUID support to Btrfs filesystems. It's present only if the
libblkid library is available on the system.

20
cmdline/unix.c
View file

@ -210,7 +210,25 @@ int filephy(const char* path, uint64_t size, uint64_t* physical)
fm.fiemap.fm_extent_count = 1; /* we are interested only at the first block */
if (ioctl(f, FS_IOC_FIEMAP, &fm) != -1) {
*physical = fm.fiemap.fm_extents[0].fe_physical + FILEPHY_REAL_OFFSET;
uint32_t flags = fm.fiemap.fm_extents[0].fe_flags;
uint64_t offset = fm.fiemap.fm_extents[0].fe_physical;
/* check some condition for validating the offset */
if (flags & FIEMAP_EXTENT_DATA_INLINE) {
/* if the data is inline, we don't have an offset to report */
*physical = FILEPHY_WITHOUT_OFFSET;
} else if (flags & FIEMAP_EXTENT_UNKNOWN) {
/* if the offset is unknown, we don't have an offset to report */
*physical = FILEPHY_WITHOUT_OFFSET;
} else if (offset == 0) {
/* 0 is the general fallback for filesystems when */
/* they don't have an offset to report */
*physical = FILEPHY_WITHOUT_OFFSET;
} else {
/* finally report the real offset */
*physical = offset + FILEPHY_REAL_OFFSET;
}
if (close(f) == -1)
return -1;
return 0;