projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
[cascardo/linux.git]
/
fs
/
iomap.c
diff --git
a/fs/iomap.c
b/fs/iomap.c
index
0342254
..
706270f
100644
(file)
--- a/
fs/iomap.c
+++ b/
fs/iomap.c
@@
-428,9
+428,12
@@
static int iomap_to_fiemap(struct fiemap_extent_info *fi,
break;
}
break;
}
+ if (iomap->flags & IOMAP_F_MERGED)
+ flags |= FIEMAP_EXTENT_MERGED;
+
return fiemap_fill_next_extent(fi, iomap->offset,
iomap->blkno != IOMAP_NULL_BLOCK ? iomap->blkno << 9: 0,
return fiemap_fill_next_extent(fi, iomap->offset,
iomap->blkno != IOMAP_NULL_BLOCK ? iomap->blkno << 9: 0,
- iomap->length, flags
| FIEMAP_EXTENT_MERGED
);
+ iomap->length, flags);
}
}