Merge branch 'dmaengine' into async-tx-next
Conflicts: crypto/async_tx/async_xor.c drivers/dma/ioat/dma_v2.h drivers/dma/ioat/pci.c drivers/md/raid5.c
This commit is contained in:
@@ -337,7 +337,8 @@ struct raid5_private_data {
|
||||
struct hlist_head *stripe_hashtbl;
|
||||
mddev_t *mddev;
|
||||
struct disk_info *spare;
|
||||
int chunk_size, level, algorithm;
|
||||
int chunk_sectors;
|
||||
int level, algorithm;
|
||||
int max_degraded;
|
||||
int raid_disks;
|
||||
int max_nr_stripes;
|
||||
@@ -353,7 +354,8 @@ struct raid5_private_data {
|
||||
*/
|
||||
sector_t reshape_safe;
|
||||
int previous_raid_disks;
|
||||
int prev_chunk, prev_algo;
|
||||
int prev_chunk_sectors;
|
||||
int prev_algo;
|
||||
short generation; /* increments with every reshape */
|
||||
unsigned long reshape_checkpoint; /* Time we last updated
|
||||
* metadata */
|
||||
@@ -424,8 +426,6 @@ struct raid5_private_data {
|
||||
|
||||
typedef struct raid5_private_data raid5_conf_t;
|
||||
|
||||
#define mddev_to_conf(mddev) ((raid5_conf_t *) mddev->private)
|
||||
|
||||
/*
|
||||
* Our supported algorithms
|
||||
*/
|
||||
|
Reference in New Issue
Block a user