Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31c93a0c authored by Milan Broz's avatar Milan Broz Committed by Linus Torvalds
Browse files

[PATCH] dm: snapshot: abstract memory release 



Move the code that releases memory used by a snapshot into a separate function.

Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Cc: dm-devel@redhat.com
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 45e15720

drivers/md/dm-snap.c

+12 −7
Original line number Diff line number Diff line
@@ -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);