ext4: Add printk priority levels to clean up checkpatch warnings (4776004f) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/ext4/balloc.c

+15 −14

Original line number	Diff line number	Diff line
		@@ -379,26 +379,28 @@ static void __rsv_window_dump(struct rb_root *root, int verbose,
		bad = 0;
		prev = NULL;

		printk("Block Allocation Reservation Windows Map (%s):\n", fn);
		printk(KERN_DEBUG "Block Allocation Reservation "
		"Windows Map (%s):\n", fn);
		while (n) {
		rsv = rb_entry(n, struct ext4_reserve_window_node, rsv_node);
		if (verbose)
		printk("reservation window 0x%p "
		printk(KERN_DEBUG "reservation window 0x%p "
		"start: %llu, end: %llu\n",
		rsv, rsv->rsv_start, rsv->rsv_end);
		if (rsv->rsv_start && rsv->rsv_start >= rsv->rsv_end) {
		printk("Bad reservation %p (start >= end)\n",
		printk(KERN_DEBUG "Bad reservation %p (start >= end)\n",
		rsv);
		bad = 1;
		}
		if (prev && prev->rsv_end >= rsv->rsv_start) {
		printk("Bad reservation %p (prev->end >= start)\n",
		rsv);
		printk(KERN_DEBUG "Bad reservation %p "
		"(prev->end >= start)\n", rsv);
		bad = 1;
		}
		if (bad) {
		if (!verbose) {
		printk("Restarting reservation walk in verbose mode\n");
		printk(KERN_DEBUG "Restarting reservation "
		"walk in verbose mode\n");
		verbose = 1;
		goto restart;
		}
		@@ -406,7 +408,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose,
		n = rb_next(n);
		prev = rsv;
		}
		printk("Window map complete.\n");
		printk(KERN_DEBUG "Window map complete.\n");
		BUG_ON(bad);
		}
		#define rsv_window_dump(root, verbose) \
		@@ -1702,7 +1704,7 @@ ext4_fsblk_t ext4_old_new_blocks(handle_t handle, struct inode inode,
		sb = inode->i_sb;
		if (!sb) {
		*errp = -ENODEV;
		printk("ext4_new_block: nonexistent device");
		printk(KERN_ERR "ext4_new_block: nonexistent superblock");
		return 0;
		}

		@@ -1884,8 +1886,8 @@ ext4_fsblk_t ext4_old_new_blocks(handle_t handle, struct inode inode,
		for (i = 0; i < num; i++) {
		if (ext4_test_bit(grp_alloc_blk+i,
		bh2jh(bitmap_bh)->b_committed_data)) {
		printk("%s: block was unexpectedly set in "
		"b_committed_data\n", __func__);
		printk(KERN_ERR "%s: block was unexpectedly "
		"set in b_committed_data\n", __func__);
		}
		}
		}
		@@ -2093,9 +2095,8 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
		bitmap_count += x;
		}
		brelse(bitmap_bh);
		printk("ext4_count_free_blocks: stored = %llu"
		", computed = %llu, %llu\n",
		ext4_free_blocks_count(es),
		printk(KERN_DEBUG "ext4_count_free_blocks: stored = %llu"
		", computed = %llu, %llu\n", ext4_free_blocks_count(es),
		desc_count, bitmap_count);
		return bitmap_count;
		#else

fs/ext4/dir.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -400,7 +400,8 @@ static int call_filldir(struct file * filp, void * dirent,
		sb = inode->i_sb;

		if (!fname) {
		printk("call_filldir: called with null fname?!?\n");
		printk(KERN_ERR "ext4: call_filldir: called with "
		"null fname?!?\n");
		return 0;
		}
		curr_pos = hash2pos(fname->hash, fname->minor_hash);

fs/ext4/extents.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -440,9 +440,10 @@ ext4_ext_binsearch_idx(struct inode *inode,
		for (k = 0; k < le16_to_cpu(eh->eh_entries); k++, ix++) {
		if (k != 0 &&
		le32_to_cpu(ix->ei_block) <= le32_to_cpu(ix[-1].ei_block)) {
		printk("k=%d, ix=0x%p, first=0x%p\n", k,
		printk(KERN_DEBUG "k=%d, ix=0x%p, "
		"first=0x%p\n", k,
		ix, EXT_FIRST_INDEX(eh));
		printk("%u <= %u\n",
		printk(KERN_DEBUG "%u <= %u\n",
		le32_to_cpu(ix->ei_block),
		le32_to_cpu(ix[-1].ei_block));
		}
		@@ -2142,7 +2143,7 @@ void ext4_ext_init(struct super_block *sb)
		*/

		if (test_opt(sb, EXTENTS)) {
		printk("EXT4-fs: file extents enabled");
		printk(KERN_INFO "EXT4-fs: file extents enabled");
		#ifdef AGGRESSIVE_TEST
		printk(", aggressive tests");
		#endif

fs/ext4/ialloc.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -170,17 +170,18 @@ void ext4_free_inode (handle_t handle, struct inode inode)
		ext4_group_t flex_group;

		if (atomic_read(&inode->i_count) > 1) {
		printk ("ext4_free_inode: inode has count=%d\n",
		printk(KERN_ERR "ext4_free_inode: inode has count=%d\n",
		atomic_read(&inode->i_count));
		return;
		}
		if (inode->i_nlink) {
		printk ("ext4_free_inode: inode has nlink=%d\n",
		printk(KERN_ERR "ext4_free_inode: inode has nlink=%d\n",
		inode->i_nlink);
		return;
		}
		if (!sb) {
		printk("ext4_free_inode: inode on nonexistent device\n");
		printk(KERN_ERR "ext4_free_inode: inode on "
		"nonexistent device\n");
		return;
		}
		sbi = EXT4_SB(sb);
		@@ -989,7 +990,8 @@ unsigned long ext4_count_free_inodes (struct super_block * sb)
		bitmap_count += x;
		}
		brelse(bitmap_bh);
		printk("ext4_count_free_inodes: stored = %u, computed = %lu, %lu\n",
		printk(KERN_DEBUG "ext4_count_free_inodes: "
		"stored = %u, computed = %lu, %lu\n",
		le32_to_cpu(es->s_free_inodes_count), desc_count, bitmap_count);
		return desc_count;
		#else

fs/ext4/mballoc.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -477,8 +477,9 @@ static void mb_cmp_bitmaps(struct ext4_buddy e4b, void bitmap)
		b2 = (unsigned char *) bitmap;
		for (i = 0; i < e4b->bd_sb->s_blocksize; i++) {
		if (b1[i] != b2[i]) {
		printk("corruption in group %lu at byte %u(%u):"
		" %x in copy != %x on disk/prealloc\n",
		printk(KERN_ERR "corruption in group %lu "
		"at byte %u(%u): %x in copy != %x "
		"on disk/prealloc\n",
		e4b->bd_group, i, i * 8, b1[i], b2[i]);
		BUG();
		}
		@@ -2560,7 +2561,7 @@ int ext4_mb_init(struct super_block *sb, int needs_recovery)
		ext4_mb_init_per_dev_proc(sb);
		ext4_mb_history_init(sb);

		printk("EXT4-fs: mballoc enabled\n");
		printk(KERN_INFO "EXT4-fs: mballoc enabled\n");
		return 0;
		}