Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (48 commits)
  Documentation: fix minor kernel-doc warnings
  BUG_ON() Conversion in drivers/net/
  BUG_ON() Conversion in drivers/s390/net/lcs.c
  BUG_ON() Conversion in mm/slab.c
  BUG_ON() Conversion in mm/highmem.c
  BUG_ON() Conversion in kernel/signal.c
  BUG_ON() Conversion in kernel/signal.c
  BUG_ON() Conversion in kernel/ptrace.c
  BUG_ON() Conversion in ipc/shm.c
  BUG_ON() Conversion in fs/freevxfs/
  BUG_ON() Conversion in fs/udf/
  BUG_ON() Conversion in fs/sysv/
  BUG_ON() Conversion in fs/inode.c
  BUG_ON() Conversion in fs/fcntl.c
  BUG_ON() Conversion in fs/dquot.c
  BUG_ON() Conversion in md/raid10.c
  BUG_ON() Conversion in md/raid6main.c
  BUG_ON() Conversion in md/raid5.c
  Fix minor documentation typo
  BFP->BPF in Documentation/networking/tuntap.txt
  ...

14 files changed, 25 insertions, 48 deletions

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 910a8ed74b5d..b05d1b218776 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -929,8 +929,7 @@ do_holes:
                         block_in_page += this_chunk_blocks;
                         dio->blocks_available -= this_chunk_blocks;
 next_block:
-                        if (dio->block_in_file > dio->final_block_in_request)
-                                BUG();
+                        BUG_ON(dio->block_in_file > dio->final_block_in_request);
                         if (dio->block_in_file == dio->final_block_in_request)
                                 break;
                 }
diff --git a/fs/dquot.c b/fs/dquot.c
index 6b3886920939..81d87a413c68 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -590,8 +590,7 @@ we_slept:
         atomic_dec(&dquot->dq_count);
 #ifdef __DQUOT_PARANOIA
         /* sanity check */
-        if (!list_empty(&dquot->dq_free))
-                BUG();
+        BUG_ON(!list_empty(&dquot->dq_free));
 #endif
         put_dquot_last(dquot);
         spin_unlock(&dq_list_lock);
@@ -666,8 +665,7 @@ we_slept:
                 return NODQUOT;
         }
 #ifdef __DQUOT_PARANOIA
-        if (!dquot->dq_sb)      /* Has somebody invalidated entry under us? */
-                BUG();
+        BUG_ON(!dquot->dq_sb);  /* Has somebody invalidated entry under us? */
 #endif
 
         return dquot;
diff --git a/fs/exec.c b/fs/exec.c
index 950ebd43cdc3..0291a68a3626 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -561,7 +561,7 @@ static int exec_mmap(struct mm_struct *mm)
         arch_pick_mmap_layout(mm);
         if (old_mm) {
                 up_read(&old_mm->mmap_sem);
-                if (active_mm != old_mm) BUG();
+                BUG_ON(active_mm != old_mm);
                 mmput(old_mm);
                 return 0;
         }
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 2a2479196f96..d35cbc6bc112 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -453,8 +453,7 @@ static void send_sigio_to_task(struct task_struct *p,
                         /* Make sure we are called with one of the POLL_*
                            reasons, otherwise we could leak kernel stack into
                            userspace.  */
-                        if ((reason & __SI_MASK) != __SI_POLL)
-                                BUG();
+                        BUG_ON((reason & __SI_MASK) != __SI_POLL);
                         if (reason - POLL_IN >= NSIGPOLL)
                                 si.si_band  = ~0L;
                         else
diff --git a/fs/freevxfs/vxfs_olt.c b/fs/freevxfs/vxfs_olt.c
index 76a0708ae978..049500847903 100644
--- a/fs/freevxfs/vxfs_olt.c
+++ b/fs/freevxfs/vxfs_olt.c
@@ -42,24 +42,21 @@
 static inline void
 vxfs_get_fshead(struct vxfs_oltfshead *fshp, struct vxfs_sb_info *infp)
 {
-        if (infp->vsi_fshino)
-                BUG();
+        BUG_ON(infp->vsi_fshino);
         infp->vsi_fshino = fshp->olt_fsino[0];
 }
 
 static inline void
 vxfs_get_ilist(struct vxfs_oltilist *ilistp, struct vxfs_sb_info *infp)
 {
-        if (infp->vsi_iext)
-                BUG();
+        BUG_ON(infp->vsi_iext);
         infp->vsi_iext = ilistp->olt_iext[0]; 
 }
 
 static inline u_long
 vxfs_oblock(struct super_block *sbp, daddr_t block, u_long bsize)
 {
-        if (sbp->s_blocksize % bsize)
-                BUG();
+        BUG_ON(sbp->s_blocksize % bsize);
         return (block * (sbp->s_blocksize / bsize));
 }
 
diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index 8f07e8fbd03d..746abc9ecf70 100644
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -466,8 +466,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)
         for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];
              *p && *p != node; p = &(*p)->next_hash)
                 ;
-        if (!*p)
-                BUG();
+        BUG_ON(!*p);
         *p = node->next_hash;
         node->tree->node_hash_cnt--;
 }
@@ -622,8 +621,7 @@ void hfs_bnode_put(struct hfs_bnode *node)
 
                 dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",
                        node->tree->cnid, node->this, atomic_read(&node->refcnt));
-                if (!atomic_read(&node->refcnt))
-                        BUG();
+                BUG_ON(!atomic_read(&node->refcnt));
                 if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
                         return;
                 for (i = 0; i < tree->pages_per_bnode; i++) {
diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c
index a67edfa34e9e..effa8991999c 100644
--- a/fs/hfsplus/btree.c
+++ b/fs/hfsplus/btree.c
@@ -269,8 +269,7 @@ void hfs_bmap_free(struct hfs_bnode *node)
         u8 *data, byte, m;
 
         dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this);
-        if (!node->this)
-                BUG();
+        BUG_ON(!node->this);
         tree = node->tree;
         nidx = node->this;
         node = hfs_bnode_find(tree, 0);
diff --git a/fs/inode.c b/fs/inode.c
index 32b7c3375021..3a2446a27d2c 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -172,8 +172,7 @@ static struct inode *alloc_inode(struct super_block *sb)
 
 void destroy_inode(struct inode *inode) 
 {
-        if (inode_has_buffers(inode))
-                BUG();
+        BUG_ON(inode_has_buffers(inode));
         security_inode_free(inode);
         if (inode->i_sb->s_op->destroy_inode)
                 inode->i_sb->s_op->destroy_inode(inode);
@@ -249,12 +248,9 @@ void clear_inode(struct inode *inode)
         might_sleep();
         invalidate_inode_buffers(inode);
        
-        if (inode->i_data.nrpages)
-                BUG();
-        if (!(inode->i_state & I_FREEING))
-                BUG();
-        if (inode->i_state & I_CLEAR)
-                BUG();
+        BUG_ON(inode->i_data.nrpages);
+        BUG_ON(!(inode->i_state & I_FREEING));
+        BUG_ON(inode->i_state & I_CLEAR);
         wait_on_inode(inode);
         DQUOT_DROP(inode);
         if (inode->i_sb && inode->i_sb->s_op->clear_inode)
@@ -1054,8 +1050,7 @@ void generic_delete_inode(struct inode *inode)
         hlist_del_init(&inode->i_hash);
         spin_unlock(&inode_lock);
         wake_up_inode(inode);
-        if (inode->i_state != I_CLEAR)
-                BUG();
+        BUG_ON(inode->i_state != I_CLEAR);
         destroy_inode(inode);
 }
 
diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 7b77a9541125..ff2a872e80e7 100644
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -35,8 +35,7 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
         pid_t pid;
         int ret = 0;
 
-        if (c->gc_task)
-                BUG();
+        BUG_ON(c->gc_task);
 
         init_completion(&c->gc_thread_start);
         init_completion(&c->gc_thread_exit);
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
index c56bd99a9701..ed9a24d19d7d 100644
--- a/fs/smbfs/file.c
+++ b/fs/smbfs/file.c
@@ -178,11 +178,9 @@ smb_writepage(struct page *page, struct writeback_control *wbc)
         unsigned offset = PAGE_CACHE_SIZE;
         int err;
 
-        if (!mapping)
-                BUG();
+        BUG_ON(!mapping);
         inode = mapping->host;
-        if (!inode)
-                BUG();
+        BUG_ON(!inode);
 
         end_index = inode->i_size >> PAGE_CACHE_SHIFT;
 
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index f26880a4785e..6cfdc9a87772 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -50,7 +50,7 @@ static struct sysfs_dirent * sysfs_new_dirent(struct sysfs_dirent * parent_sd,
         return sd;
 }
 
-/**
+/*
  *
  * Return -EEXIST if there is already a sysfs element with the same name for
  * the same parent.
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 4c29ac41ac3e..f0b347bd12ca 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -175,8 +175,7 @@ const unsigned char * sysfs_get_name(struct sysfs_dirent *sd)
         struct bin_attribute * bin_attr;
         struct sysfs_symlink  * sl;
 
-        if (!sd || !sd->s_element)
-                BUG();
+        BUG_ON(!sd || !sd->s_element);
 
         switch (sd->s_type) {
                 case SYSFS_DIR:
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index 8c66e9270dd6..d7074341ee87 100644
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -253,8 +253,7 @@ int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page)
 
         lock_page(page);
         err = mapping->a_ops->prepare_write(NULL, page, from, to);
-        if (err)
-                BUG();
+        BUG_ON(err);
         de->inode = 0;
         err = dir_commit_chunk(page, from, to);
         dir_put_page(page);
@@ -353,8 +352,7 @@ void sysv_set_link(struct sysv_dir_entry *de, struct page *page,
 
         lock_page(page);
         err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
-        if (err)
-                BUG();
+        BUG_ON(err);
         de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
         err = dir_commit_chunk(page, from, to);
         dir_put_page(page);
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 81e0e8459af1..2983afd5e7fd 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -312,12 +312,10 @@ static int udf_get_block(struct inode *inode, sector_t block, struct buffer_head
         err = 0;
 
         bh = inode_getblk(inode, block, &err, &phys, &new);
-        if (bh)
-                BUG();
+        BUG_ON(bh);
         if (err)
                 goto abort;
-        if (!phys)
-                BUG();
+        BUG_ON(!phys);
 
         if (new)
                 set_buffer_new(bh_result);