fs: use block_device name vsprintf helper (a1c6f057) · Commits · e / devices / android_kernel_fairphone_FP3

fs/btrfs/super.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1514,9 +1514,7 @@ static struct dentry btrfs_mount(struct file_system_type fs_type, int flags,
		if ((flags ^ s->s_flags) & MS_RDONLY)
		error = -EBUSY;
		} else {
		char b[BDEVNAME_SIZE];

		strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
		snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
		btrfs_sb(s)->bdev_holder = fs_type;
		error = btrfs_fill_super(s, fs_devices, data,
		flags & MS_SILENT ? 1 : 0);

fs/buffer.c

+6 −15

Original line number	Diff line number	Diff line
		@@ -134,13 +134,10 @@ __clear_page_buffers(struct page *page)

		static void buffer_io_error(struct buffer_head bh, char msg)
		{
		char b[BDEVNAME_SIZE];

		if (!test_bit(BH_Quiet, &bh->b_state))
		printk_ratelimited(KERN_ERR
		"Buffer I/O error on dev %s, logical block %llu%s\n",
		bdevname(bh->b_bdev, b),
		(unsigned long long)bh->b_blocknr, msg);
		"Buffer I/O error on dev %pg, logical block %llu%s\n",
		bh->b_bdev, (unsigned long long)bh->b_blocknr, msg);
		}

		/*
		@@ -237,15 +234,13 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
		* elsewhere, don't buffer_error if we had some unmapped buffers
		*/
		if (all_mapped) {
		char b[BDEVNAME_SIZE];

		printk("__find_get_block_slow() failed. "
		"block=%llu, b_blocknr=%llu\n",
		(unsigned long long)block,
		(unsigned long long)bh->b_blocknr);
		printk("b_state=0x%08lx, b_size=%zu\n",
		bh->b_state, bh->b_size);
		printk("device %s blocksize: %d\n", bdevname(bdev, b),
		printk("device %pg blocksize: %d\n", bdev,
		1 << bd_inode->i_blkbits);
		}
		out_unlock:
		@@ -531,10 +526,8 @@ static int osync_buffers_list(spinlock_t lock, struct list_head list)

		static void do_thaw_one(struct super_block sb, void unused)
		{
		char b[BDEVNAME_SIZE];
		while (sb->s_bdev && !thaw_bdev(sb->s_bdev, sb))
		printk(KERN_WARNING "Emergency Thaw on %s\n",
		bdevname(sb->s_bdev, b));
		printk(KERN_WARNING "Emergency Thaw on %pg\n", sb->s_bdev);
		}

		static void do_thaw_all(struct work_struct *work)
		@@ -1074,12 +1067,10 @@ grow_buffers(struct block_device *bdev, sector_t block, int size, gfp_t gfp)
		* pagecache index. (this comparison is done using sector_t types).
		*/
		if (unlikely(index != block >> sizebits)) {
		char b[BDEVNAME_SIZE];

		printk(KERN_ERR "%s: requested out-of-range block %llu for "
		"device %s\n",
		"device %pg\n",
		__func__, (unsigned long long)block,
		bdevname(bdev, b));
		bdev);
		return -EIO;
		}

fs/ext2/xattr.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -77,10 +77,8 @@
		printk("\n"); \
		} while (0)
		# define ea_bdebug(bh, f...) do { \
		char b[BDEVNAME_SIZE]; \
		printk(KERN_DEBUG "block %s:%lu: ", \
		bdevname(bh->b_bdev, b), \
		(unsigned long) bh->b_blocknr); \
		printk(KERN_DEBUG "block %pg:%lu: ", \
		bh->b_bdev, (unsigned long) bh->b_blocknr); \
		printk(f); \
		printk("\n"); \
		} while (0)

fs/ext4/page-io.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -52,9 +52,8 @@ void ext4_exit_pageio(void)
		*/
		static void buffer_io_error(struct buffer_head *bh)
		{
		char b[BDEVNAME_SIZE];
		printk_ratelimited(KERN_ERR "Buffer I/O error on device %s, logical block %llu\n",
		bdevname(bh->b_bdev, b),
		printk_ratelimited(KERN_ERR "Buffer I/O error on device %pg, logical block %llu\n",
		bh->b_bdev,
		(unsigned long long)bh->b_blocknr);
		}

fs/ext4/xattr.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -68,10 +68,8 @@
		printk("\n"); \
		} while (0)
		# define ea_bdebug(bh, f...) do { \
		char b[BDEVNAME_SIZE]; \
		printk(KERN_DEBUG "block %s:%lu: ", \
		bdevname(bh->b_bdev, b), \
		(unsigned long) bh->b_blocknr); \
		printk(KERN_DEBUG "block %pg:%lu: ", \
		bh->b_bdev, (unsigned long) bh->b_blocknr); \
		printk(f); \
		printk("\n"); \
		} while (0)