diff options
| author | Milan Broz <mbroz@redhat.com> | 2006-12-08 02:41:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:29:09 -0800 |
| commit | 31c93a0c29bf96efd806ccf4ee81cacf04f255de (patch) | |
| tree | dad0b4ce13c5efb82a5bff72fbd1a41b08042c99 | |
| parent | 45e157206c732613d1c07e8ceeb1a3e497fb2abf (diff) | |
| download | linux-31c93a0c29bf96efd806ccf4ee81cacf04f255de.tar.gz linux-31c93a0c29bf96efd806ccf4ee81cacf04f255de.tar.bz2 linux-31c93a0c29bf96efd806ccf4ee81cacf04f255de.zip | |
[PATCH] dm: snapshot: abstract memory release
Move the code that releases memory used by a snapshot into a separate function.
Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: dm-devel@redhat.com
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/md/dm-snap.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index bbf861e4fed1..50e084df554e 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -564,6 +564,17 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv) return r; } +static void __free_exceptions(struct dm_snapshot *s) +{ + kcopyd_client_destroy(s->kcopyd_client); + s->kcopyd_client = NULL; + + exit_exception_table(&s->pending, pending_cache); + exit_exception_table(&s->complete, exception_cache); + + s->store.destroy(&s->store); +} + static void snapshot_dtr(struct dm_target *ti) { struct dm_snapshot *s = (struct dm_snapshot *) ti->private; @@ -574,13 +585,7 @@ static void snapshot_dtr(struct dm_target *ti) /* After this returns there can be no new kcopyd jobs. */ unregister_snapshot(s); - kcopyd_client_destroy(s->kcopyd_client); - - exit_exception_table(&s->pending, pending_cache); - exit_exception_table(&s->complete, exception_cache); - - /* Deallocate memory used */ - s->store.destroy(&s->store); + __free_exceptions(s); dm_put_device(ti, s->origin); dm_put_device(ti, s->cow); |