aboutsummaryrefslogtreecommitdiffstats
path: root/fs/qnx6/dir.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-08-08 17:23:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:26 -0400
commitfa5a7a41a601d952e53bfcfa6d50ca22b956ee3a (patch)
treed3ec881ee67e05a477fe3262b8a72dd0b20b6356 /fs/qnx6/dir.c
parente6c3261653a22f7481791e02fe19d11faac214fb (diff)
fs/qnx6: update debugging to current functions
Add DDEBUG in Makefile when CONFIG_QNX6FS_DEBUG is set. All QNX6DEBUG messages are replaced by pr_debug which means debugging will be emitted in debug level only and no more in error and info levels. debug uses now pr_fmt and __func__ QNX6DEBUG definition has been removed. Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Joe Perches <joe@perches.com> Cc: Kai Bankett <chaosman@ontika.net> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/qnx6/dir.c')
-rw-r--r--fs/qnx6/dir.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c
index c78a3397c5a9..8d64bb5366bf 100644
--- a/fs/qnx6/dir.c
+++ b/fs/qnx6/dir.c
@@ -89,7 +89,7 @@ static int qnx6_dir_longfilename(struct inode *inode,
89 lf_size = fs16_to_cpu(sbi, lf->lf_size); 89 lf_size = fs16_to_cpu(sbi, lf->lf_size);
90 90
91 if (lf_size > QNX6_LONG_NAME_MAX) { 91 if (lf_size > QNX6_LONG_NAME_MAX) {
92 QNX6DEBUG((KERN_INFO "file %s\n", lf->lf_fname)); 92 pr_debug("file %s\n", lf->lf_fname);
93 pr_err("Filename too long (%i)\n", lf_size); 93 pr_err("Filename too long (%i)\n", lf_size);
94 qnx6_put_page(page); 94 qnx6_put_page(page);
95 return 0; 95 return 0;
@@ -101,8 +101,8 @@ static int qnx6_dir_longfilename(struct inode *inode,
101 qnx6_lfile_checksum(lf->lf_fname, lf_size)) 101 qnx6_lfile_checksum(lf->lf_fname, lf_size))
102 pr_info("long filename checksum error.\n"); 102 pr_info("long filename checksum error.\n");
103 103
104 QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n", 104 pr_debug("qnx6_readdir:%.*s inode:%u\n",
105 lf_size, lf->lf_fname, de_inode)); 105 lf_size, lf->lf_fname, de_inode);
106 if (!dir_emit(ctx, lf->lf_fname, lf_size, de_inode, DT_UNKNOWN)) { 106 if (!dir_emit(ctx, lf->lf_fname, lf_size, de_inode, DT_UNKNOWN)) {
107 qnx6_put_page(page); 107 qnx6_put_page(page);
108 return 0; 108 return 0;
@@ -158,9 +158,9 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)
158 break; 158 break;
159 } 159 }
160 } else { 160 } else {
161 QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s" 161 pr_debug("%s():%.*s inode:%u\n",
162 " inode:%u\n", size, de->de_fname, 162 __func__, size, de->de_fname,
163 no_inode)); 163 no_inode);
164 if (!dir_emit(ctx, de->de_fname, size, 164 if (!dir_emit(ctx, de->de_fname, size,
165 no_inode, DT_UNKNOWN)) { 165 no_inode, DT_UNKNOWN)) {
166 done = true; 166 done = true;