Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / fs / efs / inode.c

diff --git a/fs/efs/inode.c b/fs/efs/inode.c
index d15ccf20f1b37a9734c338941106fdc0982e0ca4..079d20306ee18990f09943c7eff4f9548cf9d761 100644 (file)
--- a/fs/efs/inode.c
+++ b/fs/efs/inode.c
@@ -89,7 +89,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
 
        bh = sb_bread(inode->i_sb, block);
        if (!bh) {
-               printk(KERN_WARNING "EFS: bread() failed at block %d\n", block);
+               pr_warn("%s() failed at block %d\n", __func__, block);
                goto read_inode_error;
        }
 
@@ -130,19 +130,16 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
        for(i = 0; i < EFS_DIRECTEXTENTS; i++) {
                extent_copy(&(efs_inode->di_u.di_extents[i]), &(in->extents[i]));
                if (i < in->numextents && in->extents[i].cooked.ex_magic != 0) {
-                       printk(KERN_WARNING "EFS: extent %d has bad magic number in inode %lu\n", i, inode->i_ino);
+                       pr_warn("extent %d has bad magic number in inode %lu\n",
+                               i, inode->i_ino);
                        brelse(bh);
                        goto read_inode_error;
                }
        }
 
        brelse(bh);
-   
-#ifdef DEBUG
-       printk(KERN_DEBUG "EFS: efs_iget(): inode %lu, extents %d, mode %o\n",
-               inode->i_ino, in->numextents, inode->i_mode);
-#endif
-
+       pr_debug("efs_iget(): inode %lu, extents %d, mode %o\n",
+                inode->i_ino, in->numextents, inode->i_mode);
        switch (inode->i_mode & S_IFMT) {
                case S_IFDIR: 
                        inode->i_op = &efs_dir_inode_operations; 
@@ -162,7 +159,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
                        init_special_inode(inode, inode->i_mode, device);
                        break;
                default:
-                       printk(KERN_WARNING "EFS: unsupported inode mode %o\n", inode->i_mode);
+                       pr_warn("unsupported inode mode %o\n", inode->i_mode);
                        goto read_inode_error;
                        break;
        }
@@ -171,7 +168,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
        return inode;
         
 read_inode_error:
-       printk(KERN_WARNING "EFS: failed to read inode %lu\n", inode->i_ino);
+       pr_warn("failed to read inode %lu\n", inode->i_ino);
        iget_failed(inode);
        return ERR_PTR(-EIO);
 }
@@ -216,7 +213,7 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
     
                /* if we only have one extent then nothing can be found */
                if (in->numextents == 1) {
-                       printk(KERN_ERR "EFS: map_block() failed to map (1 extent)\n");
+                       pr_err("%s() failed to map (1 extent)\n", __func__);
                        return 0;
                }
 
@@ -234,13 +231,12 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
                        }
                }
 
-               printk(KERN_ERR "EFS: map_block() failed to map block %u (dir)\n", block);
+               pr_err("%s() failed to map block %u (dir)\n", __func__, block);
                return 0;
        }
 
-#ifdef DEBUG
-       printk(KERN_DEBUG "EFS: map_block(): indirect search for logical block %u\n", block);
-#endif
+       pr_debug("%s(): indirect search for logical block %u\n",
+                __func__, block);
        direxts = in->extents[0].cooked.ex_offset;
        indexts = in->numextents;
 
@@ -262,7 +258,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
 
                if (dirext == direxts) {
                        /* should never happen */
-                       printk(KERN_ERR "EFS: couldn't find direct extent for indirect extent %d (block %u)\n", cur, block);
+                       pr_err("couldn't find direct extent for indirect extent %d (block %u)\n",
+                              cur, block);
                        if (bh) brelse(bh);
                        return 0;
                }
@@ -279,12 +276,12 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
 
                        bh = sb_bread(inode->i_sb, iblock);
                        if (!bh) {
-                               printk(KERN_ERR "EFS: bread() failed at block %d\n", iblock);
+                               pr_err("%s() failed at block %d\n",
+                                      __func__, iblock);
                                return 0;
                        }
-#ifdef DEBUG
-                       printk(KERN_DEBUG "EFS: map_block(): read indirect extent block %d\n", iblock);
-#endif
+                       pr_debug("%s(): read indirect extent block %d\n",
+                                __func__, iblock);
                        first = 0;
                        lastblock = iblock;
                }
@@ -294,7 +291,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
                extent_copy(&(exts[ioffset]), &ext);
 
                if (ext.cooked.ex_magic != 0) {
-                       printk(KERN_ERR "EFS: extent %d has bad magic number in block %d\n", cur, iblock);
+                       pr_err("extent %d has bad magic number in block %d\n",
+                              cur, iblock);
                        if (bh) brelse(bh);
                        return 0;
                }
@@ -306,7 +304,7 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
                }
        }
        if (bh) brelse(bh);
-       printk(KERN_ERR "EFS: map_block() failed to map block %u (indir)\n", block);
+       pr_err("%s() failed to map block %u (indir)\n", __func__, block);
        return 0;
 }