1 files changed, 37 insertions, 33 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c69145b66ea4..84f056e5d3db 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2793,6 +2793,8 @@ static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,
         int ret;
         struct btrfs_root *root = BTRFS_I(inode)->root;
         u32 csum = ~(u32)0;
+        static DEFINE_RATELIMIT_STATE(_rs, DEFAULT_RATELIMIT_INTERVAL,
+                                      DEFAULT_RATELIMIT_BURST);
 
         if (PageChecked(page)) {
                 ClearPageChecked(page);
@@ -2829,11 +2831,11 @@ good:
         return 0;
 
 zeroit:
-        printk_ratelimited(KERN_INFO "btrfs csum failed ino %llu off %llu csum %u "
-                       "private %llu\n",
-                       (unsigned long long)btrfs_ino(page->mapping->host),
-                       (unsigned long long)start, csum,
-                       (unsigned long long)private);
+        if (__ratelimit(&_rs))
+                btrfs_info(root->fs_info, "csum failed ino %llu off %llu csum %u private %llu",
+                        (unsigned long long)btrfs_ino(page->mapping->host),
+                        (unsigned long long)start, csum,
+                        (unsigned long long)private);
         memset(kaddr + offset, 1, end - start + 1);
         flush_dcache_page(page);
         kunmap_atomic(kaddr);
@@ -3114,8 +3116,8 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                  */
 
                 if (found_key.offset == last_objectid) {
-                        printk(KERN_ERR "btrfs: Error removing orphan entry, "
-                               "stopping orphan cleanup\n");
+                        btrfs_err(root->fs_info,
+                                "Error removing orphan entry, stopping orphan cleanup");
                         ret = -EINVAL;
                         goto out;
                 }
@@ -3172,8 +3174,8 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                                 ret = PTR_ERR(trans);
                                 goto out;
                         }
-                        printk(KERN_ERR "auto deleting %Lu\n",
-                               found_key.objectid);
+                        btrfs_debug(root->fs_info, "auto deleting %Lu",
+                                found_key.objectid);
                         ret = btrfs_del_orphan_item(trans, root,
                                                     found_key.objectid);
                         BUG_ON(ret); /* -ENOMEM or corruption (JDM: Recheck) */
@@ -3237,13 +3239,14 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
         }
 
         if (nr_unlink)
-                printk(KERN_INFO "btrfs: unlinked %d orphans\n", nr_unlink);
+                btrfs_info(root->fs_info, "unlinked %d orphans", nr_unlink);
         if (nr_truncate)
-                printk(KERN_INFO "btrfs: truncated %d orphans\n", nr_truncate);
+                btrfs_info(root->fs_info, "truncated %d orphans", nr_truncate);
 
 out:
         if (ret)
-                printk(KERN_CRIT "btrfs: could not do orphan cleanup %d\n", ret);
+                btrfs_crit(root->fs_info,
+                        "could not do orphan cleanup %d", ret);
         btrfs_free_path(path);
         return ret;
 }
@@ -3591,9 +3594,10 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
         ret = btrfs_del_inode_ref(trans, root, name, name_len, ino,
                                   dir_ino, &index);
         if (ret) {
-                printk(KERN_INFO "btrfs failed to delete reference to %.*s, "
-                       "inode %llu parent %llu\n", name_len, name,
-                       (unsigned long long)ino, (unsigned long long)dir_ino);
+                btrfs_info(root->fs_info,
+                        "failed to delete reference to %.*s, inode %llu parent %llu",
+                        name_len, name,
+                        (unsigned long long)ino, (unsigned long long)dir_ino);
                 btrfs_abort_transaction(trans, root, ret);
                 goto err;
         }
@@ -4670,8 +4674,9 @@ void btrfs_evict_inode(struct inode *inode)
                         ret = btrfs_block_rsv_migrate(global_rsv, rsv, min_size);
 
                 if (ret) {
-                        printk(KERN_WARNING "Could not get space for a "
-                               "delete, will truncate on mount %d\n", ret);
+                        btrfs_warn(root->fs_info,
+                                "Could not get space for a delete, will truncate on mount %d",
+                                ret);
                         btrfs_orphan_del(NULL, inode);
                         btrfs_free_block_rsv(root, rsv);
                         goto no_delete;
@@ -6259,11 +6264,11 @@ not_found_em:
 insert:
         btrfs_release_path(path);
         if (em->start > start || extent_map_end(em) <= start) {
-                printk(KERN_ERR "Btrfs: bad extent! em: [%llu %llu] passed "
-                       "[%llu %llu]\n", (unsigned long long)em->start,
-                       (unsigned long long)em->len,
-                       (unsigned long long)start,
-                       (unsigned long long)len);
+                btrfs_err(root->fs_info, "bad extent! em: [%llu %llu] passed [%llu %llu]",
+                        (unsigned long long)em->start,
+                        (unsigned long long)em->len,
+                        (unsigned long long)start,
+                        (unsigned long long)len);
                 err = -EIO;
                 goto out;
         }
@@ -6919,6 +6924,7 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)
         struct bio_vec *bvec_end = bio->bi_io_vec + bio->bi_vcnt - 1;
         struct bio_vec *bvec = bio->bi_io_vec;
         struct inode *inode = dip->inode;
+        struct btrfs_root *root = BTRFS_I(inode)->root;
         u64 start;
 
         start = dip->logical_offset;
@@ -6944,11 +6950,10 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)
                         flush_dcache_page(bvec->bv_page);
                         if (csum != private) {
 failed:
-                                printk(KERN_ERR "btrfs csum failed ino %llu off"
-                                      " %llu csum %u private %u\n",
-                                      (unsigned long long)btrfs_ino(inode),
-                                      (unsigned long long)start,
-                                      csum, (unsigned)private);
+                                btrfs_err(root->fs_info, "csum failed ino %llu off %llu csum %u private %u",
+                                        (unsigned long long)btrfs_ino(inode),
+                                        (unsigned long long)start,
+                                        csum, (unsigned)private);
                                 err = -EIO;
                         }
                 }
@@ -7940,8 +7945,8 @@ void btrfs_destroy_inode(struct inode *inode)
 
         if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
                      &BTRFS_I(inode)->runtime_flags)) {
-                printk(KERN_INFO "BTRFS: inode %llu still on the orphan list\n",
-                       (unsigned long long)btrfs_ino(inode));
+                btrfs_info(root->fs_info, "inode %llu still on the orphan list",
+                        (unsigned long long)btrfs_ino(inode));
                 atomic_dec(&root->orphan_inodes);
         }
 
@@ -7950,10 +7955,9 @@ void btrfs_destroy_inode(struct inode *inode)
                 if (!ordered)
                         break;
                 else {
-                        printk(KERN_ERR "btrfs found ordered "
-                               "extent %llu %llu on inode cleanup\n",
-                               (unsigned long long)ordered->file_offset,
-                               (unsigned long long)ordered->len);
+                        btrfs_err(root->fs_info, "found ordered extent %llu %llu on inode cleanup",
+                                (unsigned long long)ordered->file_offset,
+                                (unsigned long long)ordered->len);
                         btrfs_remove_ordered_extent(inode, ordered);
                         btrfs_put_ordered_extent(ordered);
                         btrfs_put_ordered_extent(ordered);