X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=fs%2Fiomap.c;h=706270f21b35cd23e18a5057bfec9b2995b77bba;hb=4cea8776571b18db7485930cb422faa739580c8c;hp=0342254646e358407ca35520c307529cc454a3c4;hpb=28fa9917368978e8272407f2d7f8829b17f024ea;p=cascardo%2Flinux.git

diff --git a/fs/iomap.c b/fs/iomap.c
index 0342254646e3..706270f21b35 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -428,9 +428,12 @@ static int iomap_to_fiemap(struct fiemap_extent_info *fi,
 		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,
-			iomap->length, flags | FIEMAP_EXTENT_MERGED);
+			iomap->length, flags);
 
 }