From c742de6fb1466df9cbcdee12d98bc59bbdb17c19 Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Fri, 24 Mar 2006 18:42:13 +0100 Subject: [PATCH] --- yaml --- r: 23681 b: refs/heads/master c: c5d3237c2424c4a3cf69d33abc1f229943468367 h: refs/heads/master i: 23679: 0941987a9cd00270ca02955c8d923d113d8899ed v: v3 --- [refs] | 2 +- trunk/fs/coda/cache.c | 2 +- trunk/fs/coda/cnode.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d4c489ae75e1..1ed7071a24b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88bcd51262ed45212d1b3a65abbac46eaf36bfeb +refs/heads/master: c5d3237c2424c4a3cf69d33abc1f229943468367 diff --git a/trunk/fs/coda/cache.c b/trunk/fs/coda/cache.c index c607d923350a..5d0527133266 100644 --- a/trunk/fs/coda/cache.c +++ b/trunk/fs/coda/cache.c @@ -51,7 +51,7 @@ void coda_cache_clear_all(struct super_block *sb) struct coda_sb_info *sbi; sbi = coda_sbp(sb); - if (!sbi) BUG(); + BUG_ON(!sbi); atomic_inc(&permission_epoch); } diff --git a/trunk/fs/coda/cnode.c b/trunk/fs/coda/cnode.c index 23aeef5aa814..4c9fecbfa91f 100644 --- a/trunk/fs/coda/cnode.c +++ b/trunk/fs/coda/cnode.c @@ -120,8 +120,7 @@ void coda_replace_fid(struct inode *inode, struct CodaFid *oldfid, cii = ITOC(inode); - if (!coda_fideq(&cii->c_fid, oldfid)) - BUG(); + BUG_ON(!coda_fideq(&cii->c_fid, oldfid)); /* replace fid and rehash inode */ /* XXX we probably need to hold some lock here! */