Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / md / raid0.h

diff --git a/drivers/md/raid0.h b/drivers/md/raid0.h
index 0884bba8df4ca90b36ef307b28f759e4455245a7..05539d9c97f06212ad3f436585e6574557c5f962 100644 (file)
--- a/drivers/md/raid0.h
+++ b/drivers/md/raid0.h
@@ -4,13 +4,16 @@
 struct strip_zone {
        sector_t zone_end;      /* Start of the next zone (in sectors) */
        sector_t dev_start;     /* Zone offset in real dev (in sectors) */
-       int nb_dev;             /* # of devices attached to the zone */
+       int      nb_dev;        /* # of devices attached to the zone */
 };
 
 struct r0conf {
-       struct strip_zone *strip_zone;
-       struct md_rdev **devlist; /* lists of rdevs, pointed to by strip_zone->dev */
-       int nr_strip_zones;
+       struct strip_zone       *strip_zone;
+       struct md_rdev          **devlist; /* lists of rdevs, pointed to
+                                           * by strip_zone->dev */
+       int                     nr_strip_zones;
+       int                     has_merge_bvec; /* at least one member has
+                                                * a merge_bvec_fn */
 };
 
 #endif