[PATCH 4/7] fs: use block_device name vsprintf helper
Reviewed-by: Jan Kara
Signed-off-by: Dmitry Monakhov
---
fs/btrfs/super.c |4 +---
fs/buffer.c | 21 ++---
fs/ext2/xattr.c |6 ++
fs/ext3/super.c |5 ++---
fs/ext3/xattr.c |5 ++---
fs/ext4/page-io.c |5 ++---
fs/ext4/xattr.c |6 ++
fs/f2fs/debug.c |6 ++
fs/gfs2/ops_fstype.c |4 +---
fs/jbd/commit.c |4 +---
fs/jbd/journal.c | 34 --
fs/jbd/transaction.c |6 ++
fs/jbd2/transaction.c |6 ++
fs/minix/itree_v1.c |9 -
fs/minix/itree_v2.c |9 -
fs/nilfs2/super.c |6 ++
fs/reiserfs/journal.c | 24 ++--
fs/reiserfs/prints.c |9 +++--
fs/reiserfs/procfs.c |5 ++---
fs/squashfs/super.c |7 +++
fs/super.c|4 +---
fs/xfs/xfs_buf.c |8 ++--
22 files changed, 68 insertions(+), 125 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 68ee619..0405a2f 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1376,9 +1376,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);
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..6697cc8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -130,13 +130,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, >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);
}
/*
@@ -233,15 +230,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:
@@ -527,10 +522,8 @@ repeat:
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)
@@ -1057,12 +1050,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;
}
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 0b6bfd3..192679e 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -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)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 30abbab..bd184e8 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1429,9 +1429,8
[PATCH 4/7] fs: use block_device name vsprintf helper
Reviewed-by: Jan Kara j...@suse.cz
Signed-off-by: Dmitry Monakhov dmonak...@openvz.org
---
fs/btrfs/super.c |4 +---
fs/buffer.c | 21 ++---
fs/ext2/xattr.c |6 ++
fs/ext3/super.c |5 ++---
fs/ext3/xattr.c |5 ++---
fs/ext4/page-io.c |5 ++---
fs/ext4/xattr.c |6 ++
fs/f2fs/debug.c |6 ++
fs/gfs2/ops_fstype.c |4 +---
fs/jbd/commit.c |4 +---
fs/jbd/journal.c | 34 --
fs/jbd/transaction.c |6 ++
fs/jbd2/transaction.c |6 ++
fs/minix/itree_v1.c |9 -
fs/minix/itree_v2.c |9 -
fs/nilfs2/super.c |6 ++
fs/reiserfs/journal.c | 24 ++--
fs/reiserfs/prints.c |9 +++--
fs/reiserfs/procfs.c |5 ++---
fs/squashfs/super.c |7 +++
fs/super.c|4 +---
fs/xfs/xfs_buf.c |8 ++--
22 files changed, 68 insertions(+), 125 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 68ee619..0405a2f 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1376,9 +1376,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);
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..6697cc8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -130,13 +130,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);
}
/*
@@ -233,15 +230,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:
@@ -527,10 +522,8 @@ repeat:
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)
@@ -1057,12 +1050,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;
}
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 0b6bfd3..192679e 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -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)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 30abbab..bd184e8 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1429,9 +1429,8 @@ static int
Re: [PATCH 4/7] fs: use block_device name vsprintf helper
On Mon 13-04-15 16:31:37, Dmitry Monakhov wrote:
>
> Signed-off-by: Dmitry Monakhov
Looks good to me. You can add:
Reviewed-by: Jan Kara
Honza
> ---
> fs/btrfs/super.c |4 +---
> fs/buffer.c | 21 ++---
> fs/ext2/xattr.c |6 ++
> fs/ext3/super.c |5 ++---
> fs/ext3/xattr.c |5 ++---
> fs/ext4/page-io.c |5 ++---
> fs/ext4/xattr.c |6 ++
> fs/f2fs/debug.c |6 ++
> fs/gfs2/ops_fstype.c |4 +---
> fs/jbd/commit.c |4 +---
> fs/jbd/journal.c | 34 --
> fs/jbd/transaction.c |6 ++
> fs/jbd2/transaction.c |6 ++
> fs/minix/itree_v1.c |9 -
> fs/minix/itree_v2.c |9 -
> fs/nilfs2/super.c |6 ++
> fs/reiserfs/journal.c | 24 ++--
> fs/reiserfs/prints.c |9 +++--
> fs/reiserfs/procfs.c |5 ++---
> fs/squashfs/super.c |7 +++
> fs/super.c|4 +---
> fs/xfs/xfs_buf.c |8 ++--
> 22 files changed, 68 insertions(+), 125 deletions(-)
>
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 68ee619..0405a2f 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -1376,9 +1376,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);
> diff --git a/fs/buffer.c b/fs/buffer.c
> index 20805db..6697cc8 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -130,13 +130,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, >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);
> }
>
> /*
> @@ -233,15 +230,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:
> @@ -527,10 +522,8 @@ repeat:
>
> 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)
> @@ -1057,12 +1050,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;
> }
>
> diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
> index 0b6bfd3..192679e 100644
> --- a/fs/ext2/xattr.c
> +++ b/fs/ext2/xattr.c
> @@ -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: ", \
>
Re: [PATCH 4/7] fs: use block_device name vsprintf helper
On Mon 13-04-15 16:31:37, Dmitry Monakhov wrote:
Signed-off-by: Dmitry Monakhov dmonak...@openvz.org
Looks good to me. You can add:
Reviewed-by: Jan Kara j...@suse.cz
Honza
---
fs/btrfs/super.c |4 +---
fs/buffer.c | 21 ++---
fs/ext2/xattr.c |6 ++
fs/ext3/super.c |5 ++---
fs/ext3/xattr.c |5 ++---
fs/ext4/page-io.c |5 ++---
fs/ext4/xattr.c |6 ++
fs/f2fs/debug.c |6 ++
fs/gfs2/ops_fstype.c |4 +---
fs/jbd/commit.c |4 +---
fs/jbd/journal.c | 34 --
fs/jbd/transaction.c |6 ++
fs/jbd2/transaction.c |6 ++
fs/minix/itree_v1.c |9 -
fs/minix/itree_v2.c |9 -
fs/nilfs2/super.c |6 ++
fs/reiserfs/journal.c | 24 ++--
fs/reiserfs/prints.c |9 +++--
fs/reiserfs/procfs.c |5 ++---
fs/squashfs/super.c |7 +++
fs/super.c|4 +---
fs/xfs/xfs_buf.c |8 ++--
22 files changed, 68 insertions(+), 125 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 68ee619..0405a2f 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1376,9 +1376,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);
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..6697cc8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -130,13 +130,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);
}
/*
@@ -233,15 +230,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:
@@ -527,10 +522,8 @@ repeat:
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)
@@ -1057,12 +1050,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;
}
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 0b6bfd3..192679e 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -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)
diff
[PATCH 4/7] fs: use block_device name vsprintf helper
Signed-off-by: Dmitry Monakhov
---
fs/btrfs/super.c |4 +---
fs/buffer.c | 21 ++---
fs/ext2/xattr.c |6 ++
fs/ext3/super.c |5 ++---
fs/ext3/xattr.c |5 ++---
fs/ext4/page-io.c |5 ++---
fs/ext4/xattr.c |6 ++
fs/f2fs/debug.c |6 ++
fs/gfs2/ops_fstype.c |4 +---
fs/jbd/commit.c |4 +---
fs/jbd/journal.c | 34 --
fs/jbd/transaction.c |6 ++
fs/jbd2/transaction.c |6 ++
fs/minix/itree_v1.c |9 -
fs/minix/itree_v2.c |9 -
fs/nilfs2/super.c |6 ++
fs/reiserfs/journal.c | 24 ++--
fs/reiserfs/prints.c |9 +++--
fs/reiserfs/procfs.c |5 ++---
fs/squashfs/super.c |7 +++
fs/super.c|4 +---
fs/xfs/xfs_buf.c |8 ++--
22 files changed, 68 insertions(+), 125 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 68ee619..0405a2f 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1376,9 +1376,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);
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..6697cc8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -130,13 +130,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, >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);
}
/*
@@ -233,15 +230,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:
@@ -527,10 +522,8 @@ repeat:
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)
@@ -1057,12 +1050,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;
}
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 0b6bfd3..192679e 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -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)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 30abbab..bd184e8 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1429,9 +1429,8 @@ static int
[PATCH 4/7] fs: use block_device name vsprintf helper
Signed-off-by: Dmitry Monakhov dmonak...@openvz.org
---
fs/btrfs/super.c |4 +---
fs/buffer.c | 21 ++---
fs/ext2/xattr.c |6 ++
fs/ext3/super.c |5 ++---
fs/ext3/xattr.c |5 ++---
fs/ext4/page-io.c |5 ++---
fs/ext4/xattr.c |6 ++
fs/f2fs/debug.c |6 ++
fs/gfs2/ops_fstype.c |4 +---
fs/jbd/commit.c |4 +---
fs/jbd/journal.c | 34 --
fs/jbd/transaction.c |6 ++
fs/jbd2/transaction.c |6 ++
fs/minix/itree_v1.c |9 -
fs/minix/itree_v2.c |9 -
fs/nilfs2/super.c |6 ++
fs/reiserfs/journal.c | 24 ++--
fs/reiserfs/prints.c |9 +++--
fs/reiserfs/procfs.c |5 ++---
fs/squashfs/super.c |7 +++
fs/super.c|4 +---
fs/xfs/xfs_buf.c |8 ++--
22 files changed, 68 insertions(+), 125 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 68ee619..0405a2f 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1376,9 +1376,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);
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..6697cc8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -130,13 +130,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);
}
/*
@@ -233,15 +230,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:
@@ -527,10 +522,8 @@ repeat:
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)
@@ -1057,12 +1050,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;
}
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 0b6bfd3..192679e 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -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)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 30abbab..bd184e8 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1429,9 +1429,8 @@ static int ext3_setup_super(struct super_block *sb,
struct
[PATCH 4/7] fs: use block_device name vsprintf helper
Signed-off-by: Dmitry Monakhov
---
fs/btrfs/super.c |4 +---
fs/buffer.c | 21 ++---
fs/ext2/xattr.c |6 ++
fs/ext3/super.c |5 ++---
fs/ext3/xattr.c |5 ++---
fs/ext4/page-io.c |5 ++---
fs/ext4/xattr.c |6 ++
fs/f2fs/debug.c |6 ++
fs/gfs2/ops_fstype.c |4 +---
fs/jbd/commit.c |4 +---
fs/jbd/journal.c | 34 --
fs/jbd/transaction.c |6 ++
fs/jbd2/transaction.c |6 ++
fs/minix/itree_v1.c |9 -
fs/minix/itree_v2.c |9 -
fs/nilfs2/super.c |6 ++
fs/reiserfs/journal.c | 24 ++--
fs/reiserfs/prints.c |9 +++--
fs/reiserfs/procfs.c |5 ++---
fs/squashfs/super.c |7 +++
fs/super.c|4 +---
fs/xfs/xfs_buf.c |8 ++--
22 files changed, 68 insertions(+), 125 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 05fef19..f12db53 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1376,9 +1376,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);
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..6697cc8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -130,13 +130,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, >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);
}
/*
@@ -233,15 +230,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:
@@ -527,10 +522,8 @@ repeat:
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)
@@ -1057,12 +1050,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;
}
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 9142614..f918c97 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -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)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index d4dbf3c..c186918 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1429,9 +1429,8 @@ static int
[PATCH 4/7] fs: use block_device name vsprintf helper
Signed-off-by: Dmitry Monakhov dmonak...@openvz.org
---
fs/btrfs/super.c |4 +---
fs/buffer.c | 21 ++---
fs/ext2/xattr.c |6 ++
fs/ext3/super.c |5 ++---
fs/ext3/xattr.c |5 ++---
fs/ext4/page-io.c |5 ++---
fs/ext4/xattr.c |6 ++
fs/f2fs/debug.c |6 ++
fs/gfs2/ops_fstype.c |4 +---
fs/jbd/commit.c |4 +---
fs/jbd/journal.c | 34 --
fs/jbd/transaction.c |6 ++
fs/jbd2/transaction.c |6 ++
fs/minix/itree_v1.c |9 -
fs/minix/itree_v2.c |9 -
fs/nilfs2/super.c |6 ++
fs/reiserfs/journal.c | 24 ++--
fs/reiserfs/prints.c |9 +++--
fs/reiserfs/procfs.c |5 ++---
fs/squashfs/super.c |7 +++
fs/super.c|4 +---
fs/xfs/xfs_buf.c |8 ++--
22 files changed, 68 insertions(+), 125 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 05fef19..f12db53 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1376,9 +1376,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);
diff --git a/fs/buffer.c b/fs/buffer.c
index 20805db..6697cc8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -130,13 +130,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);
}
/*
@@ -233,15 +230,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:
@@ -527,10 +522,8 @@ repeat:
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)
@@ -1057,12 +1050,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;
}
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 9142614..f918c97 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -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)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index d4dbf3c..c186918 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1429,9 +1429,8 @@ static int ext3_setup_super(struct super_block *sb,
struct
