Commit a2d2b034 authored by Jonathan Brassow's avatar Jonathan Brassow Committed by Alasdair G Kergon

dm snapshot: style cleanups

Coding style cleanups.
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
parent aa3f0794
...@@ -1045,8 +1045,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv) ...@@ -1045,8 +1045,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
s = kmalloc(sizeof(*s), GFP_KERNEL); s = kmalloc(sizeof(*s), GFP_KERNEL);
if (!s) { if (!s) {
ti->error = "Cannot allocate snapshot context private " ti->error = "Cannot allocate private snapshot structure";
"structure";
r = -ENOMEM; r = -ENOMEM;
goto bad; goto bad;
} }
...@@ -1405,7 +1404,7 @@ static void pending_complete(struct dm_snap_pending_exception *pe, int success) ...@@ -1405,7 +1404,7 @@ static void pending_complete(struct dm_snap_pending_exception *pe, int success)
*/ */
dm_insert_exception(&s->complete, e); dm_insert_exception(&s->complete, e);
out: out:
dm_remove_exception(&pe->e); dm_remove_exception(&pe->e);
snapshot_bios = bio_list_get(&pe->snapshot_bios); snapshot_bios = bio_list_get(&pe->snapshot_bios);
origin_bios = bio_list_get(&pe->origin_bios); origin_bios = bio_list_get(&pe->origin_bios);
...@@ -1470,8 +1469,7 @@ static void start_copy(struct dm_snap_pending_exception *pe) ...@@ -1470,8 +1469,7 @@ static void start_copy(struct dm_snap_pending_exception *pe)
dest.count = src.count; dest.count = src.count;
/* Hand over to kcopyd */ /* Hand over to kcopyd */
dm_kcopyd_copy(s->kcopyd_client, dm_kcopyd_copy(s->kcopyd_client, &src, 1, &dest, 0, copy_callback, pe);
&src, 1, &dest, 0, copy_callback, pe);
} }
static struct dm_snap_pending_exception * static struct dm_snap_pending_exception *
...@@ -1618,9 +1616,9 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio, ...@@ -1618,9 +1616,9 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
map_context->ptr = track_chunk(s, chunk); map_context->ptr = track_chunk(s, chunk);
} }
out_unlock: out_unlock:
up_write(&s->lock); up_write(&s->lock);
out: out:
return r; return r;
} }
...@@ -1964,7 +1962,7 @@ static int __origin_write(struct list_head *snapshots, sector_t sector, ...@@ -1964,7 +1962,7 @@ static int __origin_write(struct list_head *snapshots, sector_t sector,
pe_to_start_now = pe; pe_to_start_now = pe;
} }
next_snapshot: next_snapshot:
up_write(&snap->lock); up_write(&snap->lock);
if (pe_to_start_now) { if (pe_to_start_now) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment