diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 19:16:38 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 19:16:38 (GMT) |
commit | 7f82f000ed030d1108b4de47d9e2d556092980c6 (patch) | |
tree | 13fde544ba1e30285e94b82cad3a9c14cfaf2d63 /drivers/md/dm-snap.h | |
parent | d6c3112abe44d7f718bd5aec8ab9469fecff6041 (diff) | |
parent | 879129d208f725267366296b631aef31409cf304 (diff) | |
download | linux-fsl-qoriq-7f82f000ed030d1108b4de47d9e2d556092980c6.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
dm snapshot: wait for chunks in destructor
dm snapshot: fix register_snapshot deadlock
dm raid1: fix do_failures
Diffstat (limited to 'drivers/md/dm-snap.h')
-rw-r--r-- | drivers/md/dm-snap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h index f07315f..99c0106 100644 --- a/drivers/md/dm-snap.h +++ b/drivers/md/dm-snap.h @@ -160,6 +160,8 @@ struct dm_snapshot { mempool_t *pending_pool; + atomic_t pending_exceptions_count; + struct exception_table pending; struct exception_table complete; |