Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186423
b: refs/heads/master
c: ecdb2e2
h: refs/heads/master
i:
  186421: b6f392f
  186419: 33b54ec
  186415: 6c4a10d
v: v3
  • Loading branch information
Kiyoshi Ueda authored and Alasdair G Kergon committed Mar 6, 2010
1 parent d472fff commit 08bc6ae
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7b934c8127deebf4eb56fbe4a4ae0da16b6dbcd
refs/heads/master: ecdb2e257abc33ae6798d3ccba87bdafa40ef6b6
2 changes: 0 additions & 2 deletions trunk/drivers/md/dm-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -1231,8 +1231,6 @@ void dm_table_unplug_all(struct dm_table *t)

struct mapped_device *dm_table_get_md(struct dm_table *t)
{
dm_get(t->md);

return t->md;
}

Expand Down
7 changes: 2 additions & 5 deletions trunk/drivers/md/dm-uevent.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,17 @@ void dm_path_uevent(enum dm_uevent_type event_type, struct dm_target *ti,

if (event_type >= ARRAY_SIZE(_dm_uevent_type_names)) {
DMERR("%s: Invalid event_type %d", __func__, event_type);
goto out;
return;
}

event = dm_build_path_uevent(md, ti,
_dm_uevent_type_names[event_type].action,
_dm_uevent_type_names[event_type].name,
path, nr_valid_paths);
if (IS_ERR(event))
goto out;
return;

dm_uevent_add(md, &event->elist);

out:
dm_put(md);
}
EXPORT_SYMBOL_GPL(dm_path_uevent);

Expand Down
14 changes: 2 additions & 12 deletions trunk/drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2699,23 +2699,13 @@ int dm_suspended_md(struct mapped_device *md)

int dm_suspended(struct dm_target *ti)
{
struct mapped_device *md = dm_table_get_md(ti->table);
int r = dm_suspended_md(md);

dm_put(md);

return r;
return dm_suspended_md(dm_table_get_md(ti->table));
}
EXPORT_SYMBOL_GPL(dm_suspended);

int dm_noflush_suspending(struct dm_target *ti)
{
struct mapped_device *md = dm_table_get_md(ti->table);
int r = __noflush_suspending(md);

dm_put(md);

return r;
return __noflush_suspending(dm_table_get_md(ti->table));
}
EXPORT_SYMBOL_GPL(dm_noflush_suspending);

Expand Down

0 comments on commit 08bc6ae

Please sign in to comment.