diff options
Diffstat (limited to 'fs/minix')
-rw-r--r-- | fs/minix/itree_v1.c | 9 | ||||
-rw-r--r-- | fs/minix/itree_v2.c | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c index 282e15ad8cd8..46ca39d6c735 100644 --- a/fs/minix/itree_v1.c +++ b/fs/minix/itree_v1.c | |||
@@ -24,16 +24,15 @@ static inline block_t *i_data(struct inode *inode) | |||
24 | static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) | 24 | static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) |
25 | { | 25 | { |
26 | int n = 0; | 26 | int n = 0; |
27 | char b[BDEVNAME_SIZE]; | ||
28 | 27 | ||
29 | if (block < 0) { | 28 | if (block < 0) { |
30 | printk("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n", | 29 | printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n", |
31 | block, bdevname(inode->i_sb->s_bdev, b)); | 30 | block, inode->i_sb->s_bdev); |
32 | } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { | 31 | } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { |
33 | if (printk_ratelimit()) | 32 | if (printk_ratelimit()) |
34 | printk("MINIX-fs: block_to_path: " | 33 | printk("MINIX-fs: block_to_path: " |
35 | "block %ld too big on dev %s\n", | 34 | "block %ld too big on dev %pg\n", |
36 | block, bdevname(inode->i_sb->s_bdev, b)); | 35 | block, inode->i_sb->s_bdev); |
37 | } else if (block < 7) { | 36 | } else if (block < 7) { |
38 | offsets[n++] = block; | 37 | offsets[n++] = block; |
39 | } else if ((block -= 7) < 512) { | 38 | } else if ((block -= 7) < 512) { |
diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c index 78e2d93e5c83..1ee101352586 100644 --- a/fs/minix/itree_v2.c +++ b/fs/minix/itree_v2.c | |||
@@ -26,18 +26,17 @@ static inline block_t *i_data(struct inode *inode) | |||
26 | static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) | 26 | static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) |
27 | { | 27 | { |
28 | int n = 0; | 28 | int n = 0; |
29 | char b[BDEVNAME_SIZE]; | ||
30 | struct super_block *sb = inode->i_sb; | 29 | struct super_block *sb = inode->i_sb; |
31 | 30 | ||
32 | if (block < 0) { | 31 | if (block < 0) { |
33 | printk("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n", | 32 | printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n", |
34 | block, bdevname(sb->s_bdev, b)); | 33 | block, sb->s_bdev); |
35 | } else if ((u64)block * (u64)sb->s_blocksize >= | 34 | } else if ((u64)block * (u64)sb->s_blocksize >= |
36 | minix_sb(sb)->s_max_size) { | 35 | minix_sb(sb)->s_max_size) { |
37 | if (printk_ratelimit()) | 36 | if (printk_ratelimit()) |
38 | printk("MINIX-fs: block_to_path: " | 37 | printk("MINIX-fs: block_to_path: " |
39 | "block %ld too big on dev %s\n", | 38 | "block %ld too big on dev %pg\n", |
40 | block, bdevname(sb->s_bdev, b)); | 39 | block, sb->s_bdev); |
41 | } else if (block < DIRCOUNT) { | 40 | } else if (block < DIRCOUNT) { |
42 | offsets[n++] = block; | 41 | offsets[n++] = block; |
43 | } else if ((block -= DIRCOUNT) < INDIRCOUNT(sb)) { | 42 | } else if ((block -= DIRCOUNT) < INDIRCOUNT(sb)) { |