[PATCH] ufs: easy debug

Currently to turn on debug mode "user" has to edit ~10 files, to turn off he
has to do it again.

This patch introduce such changes:
1)turn on(off) debug messages via ".config"
2)remove unnecessary duplication of code
3)make "UFSD" macros more similar to function
4)fix some compiler warnings

Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 15 deletions

diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 2da0ffda82cc..ad017fa2dd21 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -34,14 +34,6 @@
 #include "swab.h"
 #include "util.h"
 
-#undef UFS_IALLOC_DEBUG
-
-#ifdef UFS_IALLOC_DEBUG
-#define UFSD(x) printk("(%s, %d), %s: ", __FILE__, __LINE__, __FUNCTION__); printk x;
-#else
-#define UFSD(x)
-#endif
-
 /*
  * NOTE! When we get the inode, we're the only people
  * that have access to it, and as such there are no
@@ -68,7 +60,7 @@ void ufs_free_inode (struct inode * inode)
         int is_directory;
         unsigned ino, cg, bit;
         
-        UFSD(("ENTER, ino %lu\n", inode->i_ino))
+        UFSD("ENTER, ino %lu\n", inode->i_ino);
 
         sb = inode->i_sb;
         uspi = UFS_SB(sb)->s_uspi;
@@ -130,7 +122,7 @@ void ufs_free_inode (struct inode * inode)
         
         sb->s_dirt = 1;
         unlock_super (sb);
-        UFSD(("EXIT\n"))
+        UFSD("EXIT\n");
 }
 
 /*
@@ -155,7 +147,7 @@ struct inode * ufs_new_inode(struct inode * dir, int mode)
         unsigned cg, bit, i, j, start;
         struct ufs_inode_info *ufsi;
 
-        UFSD(("ENTER\n"))
+        UFSD("ENTER\n");
         
         /* Cannot create files in a deleted directory */
         if (!dir || !dir->i_nlink)
@@ -227,7 +219,7 @@ cg_found:
                         goto failed;
                 }
         }
-        UFSD(("start = %u, bit = %u, ipg = %u\n", start, bit, uspi->s_ipg))
+        UFSD("start = %u, bit = %u, ipg = %u\n", start, bit, uspi->s_ipg);
         if (ubh_isclr (UCPI_UBH(ucpi), ucpi->c_iusedoff, bit))
                 ubh_setbit (UCPI_UBH(ucpi), ucpi->c_iusedoff, bit);
         else {
@@ -287,14 +279,14 @@ cg_found:
                 return ERR_PTR(-EDQUOT);
         }
 
-        UFSD(("allocating inode %lu\n", inode->i_ino))
-        UFSD(("EXIT\n"))
+        UFSD("allocating inode %lu\n", inode->i_ino);
+        UFSD("EXIT\n");
         return inode;
 
 failed:
         unlock_super (sb);
         make_bad_inode(inode);
         iput (inode);
-        UFSD(("EXIT (FAILED)\n"))
+        UFSD("EXIT (FAILED)\n");
         return ERR_PTR(-ENOSPC);
 }