: ufs: easy debug
PATCH 1/5 : 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 <[email protected]>
---
include/linux/ufs_fs.h +13 -0
@@ -220,6 +220,19 @@ typedef __u16 __bitwise __fs16;*/ #define UFS_MINFREE 5#define UFS_DEFAULTOPT UFS_OPTTIME + +/* +* Debug code +*/ +#ifdef CONFIG_UFS_DEBUG +# define UFSD(f, a...) { \ + printk ("UFSD (%s, %d): %s:", \ + __FILE__, __LINE__, __FUNCTION__); \ + printk (f, ## a); \ + } +#else +# define UFSD(f, a...) /**/ +#endif /* * Turn file system block numbers into disk block addresses.
fs/ufs/dir.c +10 -18
@@ -25,14 +25,6 @@#include "swab.h" #include "util.h" -#undef UFS_DIR_DEBUG - -#ifdef UFS_DIR_DEBUG -#define UFSD (x) printk("(%s, %d), %s: ", __FILE__, __LINE__, __FUNCTION__); printk x; -#else -#define UFSD (x) -#endif -/* * NOTE! unlike strncmp, ufs_match returns 1 for success, 0 for failure. *
@@ -262,7 +254,7 @@ struct ufs_dir_entry *ufs_find_entry(strstruct page *page =NULL ;struct ufs_dir_entry *de; -UFSD (("ENTER, dir_ino %lu, name %s, namlen %u\n" , dir->i_ino, name, namelen)); +UFSD ("ENTER, dir_ino %lu, name %s, namlen %u\n" , dir->i_ino, name, namelen);if (npages ==0 || namelen >UFS_MAXNAMLEN ) goto out;
@@ -326,7 +318,7 @@ int ufs_add_link(struct dentry *dentry,unsigned from, to;int err; -UFSD (("ENTER, name %s, namelen %u\n" , name, namelen)); +UFSD ("ENTER, name %s, namelen %u\n" , name, namelen);/* * We take care of directory expansion in the same loop.
@@ -442,7 +434,7 @@ ufs_readdir(struct file *filp, void *dirint need_revalidate = filp->f_version != inode->i_version;unsigned flags =UFS_SB (sb)->s_flags; -UFSD (("BEGIN" )); +UFSD ("BEGIN\n" );if (pos > inode->i_size -UFS_DIR_REC_LEN (1 ))return 0 ;
@@ -484,9 +476,9 @@ ufs_readdir(struct file *filp, void *dir offset = (char *)de - kaddr; -UFSD (("filldir(%s,%u)\n" , de->d_name, -fs32_to_cpu (sb, de->d_ino))); -UFSD (("namlen %u\n" ,ufs_get_de_namlen (sb, de))); +UFSD ("filldir(%s,%u)\n" , de->d_name, +fs32_to_cpu (sb, de->d_ino)); +UFSD ("namlen %u\n" ,ufs_get_de_namlen (sb, de));if ((flags &UFS_DE_MASK ) ==UFS_DE_44BSD ) d_type = de->d_u.d_44.d_type;
@@ -524,12 +516,12 @@ int ufs_delete_entry(struct inode *inodestruct ufs_dir_entry *de = (struct ufs_dir_entry *) (kaddr + from);int err; -UFSD (("ENTER\n" )); +UFSD ("ENTER\n" ); -UFSD (("ino %u, reclen %u, namlen %u, name %s\n" , +UFSD ("ino %u, reclen %u, namlen %u, name %s\n" ,fs32_to_cpu (sb, de->d_ino),fs16_to_cpu (sb, de->d_reclen), -ufs_get_de_namlen (sb, de), de->d_name)); +ufs_get_de_namlen (sb, de), de->d_name);while ((char *)de < (char *)dir) {if (de->d_reclen ==0 ) {
@@ -554,7 +546,7 @@ int ufs_delete_entry(struct inode *inodemark_inode_dirty (inode); out:ufs_put_page (page); -UFSD (("EXIT\n" )); +UFSD ("EXIT\n" );return err; }
fs/ufs/balloc.c +27 -35
218 lines not on this page · raw message
fs/ufs/cylinder.c +11 -20
@@ -20,15 +20,6 @@#include "swab.h" #include "util.h" -#undef UFS_CYLINDER_DEBUG - -#ifdef UFS_CYLINDER_DEBUG -#define UFSD (x) printk("(%s, %d), %s:", __FILE__, __LINE__, __FUNCTION__); printk x; -#else -#define UFSD (x) -#endif - -/* * Read cylinder group into cache. The memory space for ufs_cg_private_info * structure is already allocated during ufs_read_super.
@@ -42,7 +33,7 @@ static void ufs_read_cylinder (struct sustruct ufs_cylinder_group * ucg;unsigned i, j; -UFSD (("ENTER, cgno %u, bitmap_nr %u\n" , cgno, bitmap_nr)) +UFSD ("ENTER, cgno %u, bitmap_nr %u\n" , cgno, bitmap_nr); uspi = sbi->s_uspi; ucpi = sbi->s_ucpi[bitmap_nr]; ucg = (struct ufs_cylinder_group *)sbi->s_ucg[cgno]->b_data;
@@ -73,7 +64,7 @@ static void ufs_read_cylinder (struct su ucpi->c_clustersumoff =fs32_to_cpu (sb, ucg->cg_u.cg_44.cg_clustersumoff); ucpi->c_clusteroff =fs32_to_cpu (sb, ucg->cg_u.cg_44.cg_clusteroff); ucpi->c_nclusterblks =fs32_to_cpu (sb, ucg->cg_u.cg_44.cg_nclusterblks); -UFSD (("EXIT\n" )) +UFSD ("EXIT\n" );return ; failed:
@@ -95,11 +86,11 @@ void ufs_put_cylinder (struct super_blocstruct ufs_cylinder_group * ucg;unsigned i; -UFSD (("ENTER, bitmap_nr %u\n" , bitmap_nr)) +UFSD ("ENTER, bitmap_nr %u\n" , bitmap_nr); uspi = sbi->s_uspi;if (sbi->s_cgno[bitmap_nr] ==UFS_CGNO_EMPTY ) { -UFSD (("EXIT\n" )) +UFSD ("EXIT\n" );return ; } ucpi = sbi->s_ucpi[bitmap_nr];
@@ -122,7 +113,7 @@ void ufs_put_cylinder (struct super_bloc } sbi->s_cgno[bitmap_nr] =UFS_CGNO_EMPTY ; - UFSD(("EXIT\n")) +UFSD ("EXIT\n" ); }/*
@@ -139,7 +130,7 @@ struct ufs_cg_private_info * ufs_load_cystruct ufs_cg_private_info * ucpi;unsigned cg, i, j; -UFSD (("ENTER, cgno %u\n" , cgno)) +UFSD ("ENTER, cgno %u\n" , cgno); uspi = sbi->s_uspi;if (cgno >= uspi->s_ncg) {
@@ -150,7 +141,7 @@ struct ufs_cg_private_info * ufs_load_cy* Cylinder group number cg it in cache and it was last used */ if (sbi->s_cgno[0 ] == cgno) { - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return sbi->s_ucpi[0 ]; }/*
@@ -160,16 +151,16 @@ struct ufs_cg_private_info * ufs_load_cyif (sbi->s_cgno[cgno] !=UFS_CGNO_EMPTY ) {if (sbi->s_cgno[cgno] != cgno) {ufs_panic (sb,"ufs_load_cylinder" ,"internal error, wrong number of cg in cache" ); - UFSD(("EXIT (FAILED)\n")) +UFSD ("EXIT (FAILED)\n" );return NULL ; }else { - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return sbi->s_ucpi[cgno]; } }else {ufs_read_cylinder (sb, cgno, cgno); - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return sbi->s_ucpi[cgno]; } }
@@ -204,6 +195,6 @@ struct ufs_cg_private_info * ufs_load_cy sbi->s_ucpi[0 ] = ucpi;ufs_read_cylinder (sb, cgno,0 ); } - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return sbi->s_ucpi[0 ]; }
fs/ufs/ialloc.c +7 -15
@@ -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 * inodint 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 * inod sb->s_dirt =1 ;unlock_super (sb); - UFSD(("EXIT\n")) +UFSD ("EXIT\n" ); }/*
@@ -155,7 +147,7 @@ struct inode * ufs_new_inode(struct inodunsigned 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 ); }
fs/ufs/truncate.c +11 -19
@@ -49,14 +49,6 @@#include "swab.h" #include "util.h" -#undef UFS_TRUNCATE_DEBUG - -#ifdef UFS_TRUNCATE_DEBUG -#define UFSD (x) printk("(%s, %d), %s: ", __FILE__, __LINE__, __FUNCTION__); printk x; -#else -#define UFSD (x) -#endif -/* * Secure deletion currently doesn't work. It interacts very badly * with buffers shared with memory mappings, and for that reason
@@ -82,7 +74,7 @@ static int ufs_trunc_direct (struct inodunsigned i, tmp;int retry; -UFSD (("ENTER\n" )) +UFSD ("ENTER\n" ); sb = inode->i_sb; uspi =UFS_SB (sb)->s_uspi;
@@ -105,7 +97,7 @@ static int ufs_trunc_direct (struct inod block2 =ufs_fragstoblks (frag3); } - UFSD(("frag1 %u, frag2 %u, block1 %u, block2 %u, frag3 %u, frag4 %u\n", frag1, frag2, block1, block2, frag3, frag4)) +UFSD ("frag1 %u, frag2 %u, block1 %u, block2 %u, frag3 %u, frag4 %u\n" , frag1, frag2, block1, block2, frag3, frag4);if (frag1 >= frag2) goto next1;
@@ -171,7 +163,7 @@ next1:ufs_free_fragments (inode, tmp, frag4); next3: - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return retry; }
@@ -186,7 +178,7 @@ static int ufs_trunc_indirect (struct inunsigned frag_to_free, free_count;int retry; -UFSD (("ENTER\n" )) +UFSD ("ENTER\n" ); sb = inode->i_sb; uspi =UFS_SB (sb)->s_uspi;
@@ -252,7 +244,7 @@ static int ufs_trunc_indirect (struct in }ubh_brelse (ind_ubh); - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return retry; }
@@ -266,7 +258,7 @@ static int ufs_trunc_dindirect (struct i__fs32 * dind;int retry =0 ; -UFSD (("ENTER\n" )) +UFSD ("ENTER\n" ); sb = inode->i_sb; uspi =UFS_SB (sb)->s_uspi;
@@ -315,7 +307,7 @@ static int ufs_trunc_dindirect (struct i }ubh_brelse (dind_bh); - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return retry; }
@@ -330,7 +322,7 @@ static int ufs_trunc_tindirect (struct i__fs32 * tind, * p;int retry; -UFSD (("ENTER\n" )) +UFSD ("ENTER\n" ); sb = inode->i_sb; uspi =UFS_SB (sb)->s_uspi;
@@ -375,7 +367,7 @@ static int ufs_trunc_tindirect (struct i }ubh_brelse (tind_bh); - UFSD(("EXIT\n")) +UFSD ("EXIT\n" );return retry; }
@@ -386,7 +378,7 @@ void ufs_truncate (struct inode * inode)struct ufs_sb_private_info * uspi;int retry; -UFSD (("ENTER\n" )) +UFSD ("ENTER\n" ); sb = inode->i_sb; uspi =UFS_SB (sb)->s_uspi;
@@ -417,5 +409,5 @@ void ufs_truncate (struct inode * inode) ufsi->i_lastfrag =DIRECT_FRAGMENT ;unlock_kernel ();mark_inode_dirty (inode); - UFSD(("EXIT\n")) +UFSD ("EXIT\n" ); }
fs/ufs/super.c +54 -60
318 lines not on this page · raw message
fs/ufs/inode.c +19 -28
151 lines not on this page · raw message
fs/ufs/namei.c +8 -13
@@ -34,17 +34,6 @@#include "swab.h" /* will go away - see comment in mknod() */ #include "util.h" -/* -#undef UFS_NAMEI_DEBUG -*/ -#define UFS_NAMEI_DEBUG - -#ifdef UFS_NAMEI_DEBUG -#define UFSD (x) printk("(%s, %d), %s: ", __FILE__, __LINE__, __FUNCTION__); printk x; -#else -#define UFSD (x) -#endif -static inline int ufs_add_nondir (struct dentry *dentry,struct inode *inode) {int err =ufs_add_link (dentry, inode);
@@ -90,8 +79,13 @@ static struct dentry *ufs_lookup(structstatic int ufs_create (struct inode * dir,struct dentry * dentry,int mode,struct nameidata *nd) { -struct inode * inode =ufs_new_inode (dir, mode); -int err =PTR_ERR (inode); +struct inode *inode; +int err; + +UFSD ("BEGIN\n" ); + inode =ufs_new_inode (dir, mode); + err =PTR_ERR (inode); +if (!IS_ERR (inode)) { inode->i_op = &ufs_file_inode_operations; inode->i_fop = &ufs_file_operations;
@@ -101,6 +95,7 @@ static int ufs_create (struct inode * di err =ufs_add_nondir (dentry, inode);unlock_kernel (); } +UFSD ("END: err=%d\n" , err);return err; }
fs/ufs/util.c +0 -9
@@ -14,15 +14,6 @@#include "swab.h" #include "util.h" -#undef UFS_UTILS_DEBUG - -#ifdef UFS_UTILS_DEBUG -#define UFSD (x) printk("(%s, %d), %s: ", __FILE__, __LINE__, __FUNCTION__); printk x; -#else -#define UFSD (x) -#endif - -struct ufs_buffer_head *_ubh_bread_ (struct ufs_sb_private_info * uspi,struct super_block *sb,u64 fragment,u64 size) {
fs/Kconfig +8 -0
@@ -1389,6 +1389,14 @@ config UFS_FS_WRITE Say Y here if you want to try writing to UFS partitions. This is experimental, so you should back up your UFS partitions beforehand. +config UFS_DEBUG + bool "UFS debugging" + depends on UFS_FS + help + If you are experiencing any problems with the UFS filesystem, say + Y here. This will result in _many_ additional debugging messages to be + written to the system log. + endmenu menu "Network File Systems"
Signature · 1 line
/Evgeniy