diff options
author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /fs/coda/cache.c | |
parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/coda/cache.c')
-rw-r--r-- | fs/coda/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/coda/cache.c b/fs/coda/cache.c index c607d923350a..5d0527133266 100644 --- a/fs/coda/cache.c +++ b/fs/coda/cache.c | |||
@@ -51,7 +51,7 @@ void coda_cache_clear_all(struct super_block *sb) | |||
51 | struct coda_sb_info *sbi; | 51 | struct coda_sb_info *sbi; |
52 | 52 | ||
53 | sbi = coda_sbp(sb); | 53 | sbi = coda_sbp(sb); |
54 | if (!sbi) BUG(); | 54 | BUG_ON(!sbi); |
55 | 55 | ||
56 | atomic_inc(&permission_epoch); | 56 | atomic_inc(&permission_epoch); |
57 | } | 57 | } |