diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 09:41:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 09:41:18 -0800 |
| commit | 9ae21d1bb376436285cd5346d3e4b3655d6dd1b9 (patch) | |
| tree | 8f889770fae721da63bd378c1834a87e2eb1cfb5 /drivers/md | |
| parent | f9b4192923fa6e38331e88214b1fe5fc21583fcc (diff) | |
| parent | e9415777b1cd0eaf4d1d3d61772f0e6d5c2551ad (diff) | |
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/
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-path-selector.c | 3 | ||||
| -rw-r--r-- | drivers/md/dm-table.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c index a28c1c2b4ef..f10a0c89b3f 100644 --- a/drivers/md/dm-path-selector.c +++ b/drivers/md/dm-path-selector.c @@ -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); diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 9b1e2f5ca63..907b08ddb78 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -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 */ |