Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment Kconfig help: MTD_JEDECPROBE already supports Intel Remove ugly debugging stuff do_mounts.c: Minor ROOT_DEV comment cleanup BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c BUG_ON() Conversion in mm/mempool.c BUG_ON() Conversion in mm/memory.c BUG_ON() Conversion in kernel/fork.c BUG_ON() Conversion in ipc/sem.c BUG_ON() Conversion in fs/ext2/ BUG_ON() Conversion in fs/hfs/ BUG_ON() Conversion in fs/dcache.c BUG_ON() Conversion in fs/buffer.c BUG_ON() Conversion in input/serio/hp_sdc_mlc.c BUG_ON() Conversion in md/dm-table.c BUG_ON() Conversion in md/dm-path-selector.c BUG_ON() Conversion in drivers/isdn BUG_ON() Conversion in drivers/char BUG_ON() Conversion in drivers/mtd/
This commit is contained in:
@ -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);
|
||||
|
@ -352,8 +352,7 @@ static int open_dev(struct dm_dev *d, dev_t dev)
|
||||
|
||||
int r;
|
||||
|
||||
if (d->bdev)
|
||||
BUG();
|
||||
BUG_ON(d->bdev);
|
||||
|
||||
bdev = open_by_devnum(dev, d->mode);
|
||||
if (IS_ERR(bdev))
|
||||
@ -427,8 +426,7 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
|
||||
struct dm_dev *dd;
|
||||
unsigned int major, minor;
|
||||
|
||||
if (!t)
|
||||
BUG();
|
||||
BUG_ON(!t);
|
||||
|
||||
if (sscanf(path, "%u:%u", &major, &minor) == 2) {
|
||||
/* Extract the major/minor numbers */
|
||||
|
Reference in New Issue
Block a user