X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmd%2Fdm-path-selector.c;h=ca1bb636a3e4ba808ae63d88dfbb62bc4ee28a04;hb=14f7d720bb6cc60be8931ea1a0f547dc1e475b88;hp=ac5c4bbec6c188b547ce1804be38e80bebf5a33d;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=linux-2.6 diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c index ac5c4bbec6..ca1bb636a3 100644 --- a/drivers/md/dm-path-selector.c +++ b/drivers/md/dm-path-selector.c @@ -26,7 +26,7 @@ struct ps_internal { static LIST_HEAD(_path_selectors); static DECLARE_RWSEM(_ps_lock); -struct ps_internal *__find_path_selector_type(const char *name) +static struct ps_internal *__find_path_selector_type(const char *name) { struct ps_internal *psi; @@ -86,8 +86,7 @@ void dm_put_path_selector(struct path_selector_type *pst) if (--psi->use == 0) module_put(psi->pst.module); - if (psi->use < 0) - BUG(); + BUG_ON(psi->use < 0); out: up_read(&_ps_lock); @@ -95,12 +94,10 @@ out: static struct ps_internal *_alloc_path_selector(struct path_selector_type *pst) { - struct ps_internal *psi = kmalloc(sizeof(*psi), GFP_KERNEL); + struct ps_internal *psi = kzalloc(sizeof(*psi), GFP_KERNEL); - if (psi) { - memset(psi, 0, sizeof(*psi)); + if (psi) psi->pst = *pst; - } return psi; }