fs/qnx6: update debugging to current functions (fa5a7a41) · Commits · e / devices / android_kernel_xiaomi_markw

fs/qnx6/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,3 +5,4 @@
	obj-$(CONFIG_QNX6FS_FS) += qnx6.o		obj-$(CONFIG_QNX6FS_FS) += qnx6.o

	qnx6-objs := inode.o dir.o namei.o super_mmi.o		qnx6-objs := inode.o dir.o namei.o super_mmi.o
			ccflags-$(CONFIG_QNX6FS_DEBUG) += -DDEBUG

fs/qnx6/dir.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,7 @@ static int qnx6_dir_longfilename(struct inode *inode,
	lf_size = fs16_to_cpu(sbi, lf->lf_size);		lf_size = fs16_to_cpu(sbi, lf->lf_size);

	if (lf_size > QNX6_LONG_NAME_MAX) {		if (lf_size > QNX6_LONG_NAME_MAX) {
	QNX6DEBUG((KERN_INFO "file %s\n", lf->lf_fname));		pr_debug("file %s\n", lf->lf_fname);
	pr_err("Filename too long (%i)\n", lf_size);		pr_err("Filename too long (%i)\n", lf_size);
	qnx6_put_page(page);		qnx6_put_page(page);
	return 0;		return 0;
	@@ -101,8 +101,8 @@ static int qnx6_dir_longfilename(struct inode *inode,
	qnx6_lfile_checksum(lf->lf_fname, lf_size))		qnx6_lfile_checksum(lf->lf_fname, lf_size))
	pr_info("long filename checksum error.\n");		pr_info("long filename checksum error.\n");

	QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n",		pr_debug("qnx6_readdir:%.*s inode:%u\n",
	lf_size, lf->lf_fname, de_inode));		lf_size, lf->lf_fname, de_inode);
	if (!dir_emit(ctx, lf->lf_fname, lf_size, de_inode, DT_UNKNOWN)) {		if (!dir_emit(ctx, lf->lf_fname, lf_size, de_inode, DT_UNKNOWN)) {
	qnx6_put_page(page);		qnx6_put_page(page);
	return 0;		return 0;
	@@ -158,9 +158,9 @@ static int qnx6_readdir(struct file file, struct dir_context ctx)
	break;		break;
	}		}
	} else {		} else {
	QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s"		pr_debug("%s():%.*s inode:%u\n",
	" inode:%u\n", size, de->de_fname,		__func__, size, de->de_fname,
	no_inode));		no_inode);
	if (!dir_emit(ctx, de->de_fname, size,		if (!dir_emit(ctx, de->de_fname, size,
	no_inode, DT_UNKNOWN)) {		no_inode, DT_UNKNOWN)) {
	done = true;		done = true;

fs/qnx6/inode.c

+13 −24

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,8 @@ static int qnx6_get_block(struct inode *inode, sector_t iblock,
	{		{
	unsigned phys;		unsigned phys;

	QNX6DEBUG((KERN_INFO "qnx6: qnx6_get_block inode=[%ld] iblock=[%ld]\n",		pr_debug("qnx6_get_block inode=[%ld] iblock=[%ld]\n",
	inode->i_ino, (unsigned long)iblock));		inode->i_ino, (unsigned long)iblock);

	phys = qnx6_block_map(inode, iblock);		phys = qnx6_block_map(inode, iblock);
	if (phys) {		if (phys) {
	@@ -205,26 +205,16 @@ void qnx6_superblock_debug(struct qnx6_super_block sb, struct super_block s)
	{		{
	struct qnx6_sb_info *sbi = QNX6_SB(s);		struct qnx6_sb_info *sbi = QNX6_SB(s);

	QNX6DEBUG((KERN_INFO "magic: %08x\n",		pr_debug("magic: %08x\n", fs32_to_cpu(sbi, sb->sb_magic));
	fs32_to_cpu(sbi, sb->sb_magic)));		pr_debug("checksum: %08x\n", fs32_to_cpu(sbi, sb->sb_checksum));
	QNX6DEBUG((KERN_INFO "checksum: %08x\n",		pr_debug("serial: %llx\n", fs64_to_cpu(sbi, sb->sb_serial));
	fs32_to_cpu(sbi, sb->sb_checksum)));		pr_debug("flags: %08x\n", fs32_to_cpu(sbi, sb->sb_flags));
	QNX6DEBUG((KERN_INFO "serial: %llx\n",		pr_debug("blocksize: %08x\n", fs32_to_cpu(sbi, sb->sb_blocksize));
	fs64_to_cpu(sbi, sb->sb_serial)));		pr_debug("num_inodes: %08x\n", fs32_to_cpu(sbi, sb->sb_num_inodes));
	QNX6DEBUG((KERN_INFO "flags: %08x\n",		pr_debug("free_inodes: %08x\n", fs32_to_cpu(sbi, sb->sb_free_inodes));
	fs32_to_cpu(sbi, sb->sb_flags)));		pr_debug("num_blocks: %08x\n", fs32_to_cpu(sbi, sb->sb_num_blocks));
	QNX6DEBUG((KERN_INFO "blocksize: %08x\n",		pr_debug("free_blocks: %08x\n", fs32_to_cpu(sbi, sb->sb_free_blocks));
	fs32_to_cpu(sbi, sb->sb_blocksize)));		pr_debug("inode_levels: %02x\n", sb->Inode.levels);
	QNX6DEBUG((KERN_INFO "num_inodes: %08x\n",
	fs32_to_cpu(sbi, sb->sb_num_inodes)));
	QNX6DEBUG((KERN_INFO "free_inodes: %08x\n",
	fs32_to_cpu(sbi, sb->sb_free_inodes)));
	QNX6DEBUG((KERN_INFO "num_blocks: %08x\n",
	fs32_to_cpu(sbi, sb->sb_num_blocks)));
	QNX6DEBUG((KERN_INFO "free_blocks: %08x\n",
	fs32_to_cpu(sbi, sb->sb_free_blocks)));
	QNX6DEBUG((KERN_INFO "inode_levels: %02x\n",
	sb->Inode.levels));
	}		}
	#endif		#endif

	@@ -283,8 +273,7 @@ static struct buffer_head qnx6_check_first_superblock(struct super_block s,
	sbi->s_bytesex = BYTESEX_BE;		sbi->s_bytesex = BYTESEX_BE;
	if (fs32_to_cpu(sbi, sb->sb_magic) == QNX6_SUPER_MAGIC) {		if (fs32_to_cpu(sbi, sb->sb_magic) == QNX6_SUPER_MAGIC) {
	/* we got a big endian fs */		/* we got a big endian fs */
	QNX6DEBUG((KERN_INFO "qnx6: fs got different"		pr_debug("fs got different endianness.\n");
	" endianness.\n"));
	return bh;		return bh;
	} else		} else
	sbi->s_bytesex = BYTESEX_LE;		sbi->s_bytesex = BYTESEX_LE;

fs/qnx6/namei.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -29,12 +29,12 @@ struct dentry qnx6_lookup(struct inode dir, struct dentry *dentry,
	foundinode = qnx6_iget(dir->i_sb, ino);		foundinode = qnx6_iget(dir->i_sb, ino);
	qnx6_put_page(page);		qnx6_put_page(page);
	if (IS_ERR(foundinode)) {		if (IS_ERR(foundinode)) {
	QNX6DEBUG((KERN_ERR "qnx6: lookup->iget -> "		pr_debug("lookup->iget -> error %ld\n",
	" error %ld\n", PTR_ERR(foundinode)));		PTR_ERR(foundinode));
	return ERR_CAST(foundinode);		return ERR_CAST(foundinode);
	}		}
	} else {		} else {
	QNX6DEBUG((KERN_INFO "qnx6_lookup: not found %s\n", name));		pr_debug("%s(): not found %s\n", __func__, name);
	return NULL;		return NULL;
	}		}
	d_add(dentry, foundinode);		d_add(dentry, foundinode);

fs/qnx6/qnx6.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -25,12 +25,6 @@ typedef __u64 __bitwise __fs64;

	#include <linux/qnx6_fs.h>		#include <linux/qnx6_fs.h>

	#ifdef CONFIG_QNX6FS_DEBUG
	#define QNX6DEBUG(X) printk X
	#else
	#define QNX6DEBUG(X) (void) 0
	#endif

	struct qnx6_sb_info {		struct qnx6_sb_info {
	struct buffer_head sb_buf; / superblock buffer */		struct buffer_head sb_buf; / superblock buffer */
	struct qnx6_super_block sb; / our superblock */		struct qnx6_super_block sb; / our superblock */