Merge tag 'for-linus-20151217' of git://git.infradead.org/linux-mtd

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

diff --git a/fs/efs/dir.c b/fs/efs/dir.c
index b72307ccdf7afc08c2062741a585b971d0e99a15..ce63b24f7c3e2a95b5f19d6ef1b6f376477ddf64 100644 (file)
--- a/fs/efs/dir.c
+++ b/fs/efs/dir.c
@@ -26,7 +26,8 @@ static int efs_readdir(struct file *file, struct dir_context *ctx)
        int                     slot;
 
        if (inode->i_size & (EFS_DIRBSIZE-1))
-               printk(KERN_WARNING "EFS: WARNING: readdir(): directory size not a multiple of EFS_DIRBSIZE\n");
+               pr_warn("%s(): directory size not a multiple of EFS_DIRBSIZE\n",
+                       __func__);
 
        /* work out where this entry can be found */
        block = ctx->pos >> EFS_DIRBSIZE_BITS;
@@ -43,14 +44,15 @@ static int efs_readdir(struct file *file, struct dir_context *ctx)
                bh = sb_bread(inode->i_sb, efs_bmap(inode, block));
 
                if (!bh) {
-                       printk(KERN_ERR "EFS: readdir(): failed to read dir block %d\n", block);
+                       pr_err("%s(): failed to read dir block %d\n",
+                              __func__, block);
                        break;
                }
 
                dirblock = (struct efs_dir *) bh->b_data; 
 
                if (be16_to_cpu(dirblock->magic) != EFS_DIRBLK_MAGIC) {
-                       printk(KERN_ERR "EFS: readdir(): invalid directory block\n");
+                       pr_err("%s(): invalid directory block\n", __func__);
                        brelse(bh);
                        break;
                }
@@ -69,10 +71,9 @@ static int efs_readdir(struct file *file, struct dir_context *ctx)
                        inodenum = be32_to_cpu(dirslot->inode);
                        namelen  = dirslot->namelen;
                        nameptr  = dirslot->name;
-
-#ifdef DEBUG
-                       printk(KERN_DEBUG "EFS: readdir(): block %d slot %d/%d: inode %u, name \"%s\", namelen %u\n", block, slot, dirblock->slots-1, inodenum, nameptr, namelen);
-#endif
+                       pr_debug("%s(): block %d slot %d/%d: inode %u, name \"%s\", namelen %u\n",
+                                __func__, block, slot, dirblock->slots-1,
+                                inodenum, nameptr, namelen);
                        if (!namelen)
                                continue;
                        /* found the next entry */
@@ -80,7 +81,8 @@ static int efs_readdir(struct file *file, struct dir_context *ctx)
 
                        /* sanity check */
                        if (nameptr - (char *) dirblock + namelen > EFS_DIRBSIZE) {
-                               printk(KERN_WARNING "EFS: directory entry %d exceeds directory block\n", slot);
+                               pr_warn("directory entry %d exceeds directory block\n",
+                                       slot);
                                continue;
                        }