diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /drivers/md/md.h | |
parent | arch/tile: catch up on various minor cleanups. (diff) | |
parent | Linux 2.6.35-rc4 (diff) | |
download | linux-a2262d8a231e92742651859a10c9a4430a5e899a.tar.xz linux-a2262d8a231e92742651859a10c9a4430a5e899a.zip |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/md/md.h')
-rw-r--r-- | drivers/md/md.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/md.h b/drivers/md/md.h index 7ab5ea155452..10597bfec000 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -78,6 +78,9 @@ struct mdk_rdev_s int desc_nr; /* descriptor index in the superblock */ int raid_disk; /* role of device in array */ + int new_raid_disk; /* role that the device will have in + * the array after a level-change completes. + */ int saved_raid_disk; /* role that device used to have in the * array and could again if we did a partial * resync from the bitmap |