diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:33 +0200 |
| commit | 2143dfda8b32b8d1cda16982efeca57ca97b3996 (patch) | |
| tree | c25f94177de151e9f53f82f2ee27646e23ad2e2e /fs | |
| parent | eebe92e3ad8b8516108aa1e00092ed542429087c (diff) | |
| parent | c44eabb10992216213a42fdd5eaead376342a83a (diff) | |
| download | barebox-2143dfda8b32b8d1cda16982efeca57ca97b3996.tar.gz barebox-2143dfda8b32b8d1cda16982efeca57ca97b3996.tar.xz | |
Merge branch 'for-next/pr_print'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/ext4_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index f426118c53..ceb965f492 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -89,7 +89,7 @@ static int ext4fs_blockgroup(struct ext2_data *data, int group, group / desc_per_blk; blkoff = (group % desc_per_blk) * sizeof(struct ext2_block_group); - debug("ext4fs read %d group descriptor (blkno %ld blkoff %u)\n", + dev_dbg(fs->dev, "read %d group descriptor (blkno %ld blkoff %u)\n", group, blkno, blkoff); return ext4fs_devread(fs, blkno << LOG2_EXT2_BLOCK_SIZE(data), @@ -139,7 +139,7 @@ int ext4fs_get_indir_block(struct ext2fs_node *node, struct ext4fs_indir_block * ret = ext4fs_devread(fs, blkno, 0, blksz, (void *)indir->data); if (ret) { - printf("** SI ext2fs read block (indir 1)" + dev_err(fs->dev, "** SI ext2fs read block (indir 1)" "failed. **\n"); return ret; } @@ -177,7 +177,7 @@ long int read_allocated_block(struct ext2fs_node *node, int fileblock) (struct ext4_extent_header *)inode->b.blocks.dir_blocks, fileblock, log2_blksz); if (!ext_block) { - printf("invalid extent block\n"); + pr_err("invalid extent block\n"); free(buf); return -EINVAL; } @@ -269,10 +269,10 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name, unsigned int fpos = 0; int status, ret; struct ext2fs_node *diro = (struct ext2fs_node *) dir; - + struct ext_filesystem *fs = dir->data->fs; if (name != NULL) - debug("Iterate dir %s\n", name); + dev_dbg(fs->dev, "Iterate dir %s\n", name); if (!diro->inode_read) { ret = ext4fs_read_inode(diro->data, diro->ino, &diro->inode); @@ -345,7 +345,7 @@ int ext4fs_iterate_dir(struct ext2fs_node *dir, char *name, } } - debug("iterate >%s<\n", filename); + dev_dbg(fs->dev, "iterate >%s<\n", filename); if (strcmp(filename, name) == 0) { *ftype = type; |