Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / fs / reiserfs / file.c

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 41f24369e47a0945e67fd52a10fa3bcabc357943..ac14318c81ba71eaf944e120c26f4b9630d16b0e 100644 (file)
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -2,7 +2,6 @@
  * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README
  */
 
-#include <linux/config.h>
 #include <linux/time.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/reiserfs_acl.h>
@@ -38,8 +37,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp)
        int err;
        int jbegin_failure = 0;
 
-       if (!S_ISREG(inode->i_mode))
-               BUG();
+       BUG_ON(!S_ISREG(inode->i_mode));
 
        /* fast out for when nothing needs to be done */
        if ((atomic_read(&inode->i_count) > 1 ||
@@ -76,7 +74,8 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp)
                        igrab(inode);
                        reiserfs_warning(inode->i_sb,
                                         "pinning inode %lu because the "
-                                        "preallocation can't be freed");
+                                        "preallocation can't be freed",
+                                        inode->i_ino);
                        goto out;
                }
        }
@@ -125,8 +124,7 @@ static int reiserfs_sync_file(struct file *p_s_filp,
        int n_err;
        int barrier_done;
 
-       if (!S_ISREG(p_s_inode->i_mode))
-               BUG();
+       BUG_ON(!S_ISREG(p_s_inode->i_mode));
        n_err = sync_mapping_buffers(p_s_inode->i_mapping);
        reiserfs_write_lock(p_s_inode->i_sb);
        barrier_done = reiserfs_commit_for_inode(p_s_inode);