Btrfs: convert printk to btrfs_ and fix BTRFS prefix
PATCH v4 1/1 Btrfs: convert printk to btrfs_ and fix BTRFS prefix
Convert all applicable cases of printk and pr_* to the btrfs_* macros.
Fix all uses of the BTRFS prefix.
---
v4 - rebase to master btrfs-next, compile and run tested v3 - cleanup problems noted by David, convert prefix to BTRFS v2 - changed pr_ and printk to btrfs_ output macro
fs/btrfs/compression.c | 12 ++--- fs/btrfs/ctree.c | 16 +++--- fs/btrfs/ctree.h | 4 +- fs/btrfs/delayed-inode.c | 10 ++-- fs/btrfs/dev-replace.c | 56 +++++++++++--------- fs/btrfs/dir-item.c | 6 +-- fs/btrfs/disk-io.c | 106 +++++++++++++++++++------------------- fs/btrfs/extent-tree.c | 14 ++--- fs/btrfs/extent_io.c | 61 +++++++++++++--------- fs/btrfs/file-item.c | 4 +- fs/btrfs/free-space-cache.c | 21 ++++---- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 30 +++++------ fs/btrfs/lzo.c | 6 +-- fs/btrfs/ordered-data.c | 12 +++-- fs/btrfs/print-tree.c | 2 +- fs/btrfs/qgroup.c | 28 +++++----- fs/btrfs/reada.c | 9 ++-- fs/btrfs/relocation.c | 4 +- fs/btrfs/root-tree.c | 4 +- fs/btrfs/scrub.c | 50 +++++++++--------- fs/btrfs/send.c | 4 +- fs/btrfs/super.c | 104 ++++++++++++++++++------------------- fs/btrfs/sysfs.c | 2 +- fs/btrfs/tests/extent-io-tests.c | 4 +- fs/btrfs/transaction.c | 8 +-- fs/btrfs/uuid-tree.c | 13 ++--- fs/btrfs/volumes.c | 89 ++++++++++++++++---------------- fs/btrfs/zlib.c | 8 +-- 29 files changed, 361 insertions(+), 330 deletions(-)
fs/btrfs/compression.c +6 -6
@@ -128,11 +128,10 @@ static int check_compressed_csum(struct inode *inode,kunmap_atomic (kaddr);if (csum != *cb_sum) { -printk (KERN_INFO "btrfs csum failed ino %llu " -"extent %llu csum %u " -"wanted %u mirror %d\n" , -btrfs_ino (inode), disk_start, csum, *cb_sum, - cb->mirror_num); +btrfs_info (BTRFS_I (inode)->root->fs_info, +"csum failed ino %llu extent %llu csum %u wanted %u mirror %d" , +btrfs_ino (inode), disk_start, csum, *cb_sum, + cb->mirror_num); ret = -EIO ; goto fail; }
@@ -412,7 +411,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,bio_add_page (bio, page,PAGE_CACHE_SIZE ,0 ); }if (bytes_left <PAGE_CACHE_SIZE ) { -printk ("bytes left %lu compress len %lu nr %lu\n" , +btrfs_info (BTRFS_I (inode)->root->fs_info, +"bytes left %lu compress len %lu nr %lu" , bytes_left, cb->compressed_len, cb->nr_pages); } bytes_left -=PAGE_CACHE_SIZE ;
fs/btrfs/ctree.c +8 -8
@@ -1286,8 +1286,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq) old =read_tree_block (root, logical, blocksize,0 );if (WARN_ON (!old || !extent_buffer_uptodate (old))) {free_extent_buffer (old); -pr_warn ("btrfs: failed to read tree block %llu from get_old_root\n" , - logical); +btrfs_warn (root->fs_info, +"failed to read tree block %llu from get_old_root" , logical); }else { eb =btrfs_clone_extent_buffer (old);free_extent_buffer (old);
@@ -3404,8 +3404,8 @@ noinline int btrfs_leaf_free_space(struct btrfs_root *root,int ret; ret =BTRFS_LEAF_DATA_SIZE (root) -leaf_space_used (leaf,0 , nritems);if (ret <0 ) { -printk (KERN_CRIT "leaf free space ret %d, leaf data size %lu, " -"used %d nritems %d\n" , +btrfs_crit (root->fs_info, +"leaf free space ret %d, leaf data size %lu, used %d nritems %d" , ret, (unsigned long )BTRFS_LEAF_DATA_SIZE (root),leaf_space_used (leaf,0 , nritems), nritems); }
@@ -4495,7 +4495,7 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,BUG_ON (slot <0 );if (slot >= nritems) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "slot %d too large, nritems %d\n" , +btrfs_crit (root->fs_info,"slot %d too large, nritems %d" , slot, nritems);BUG_ON (1 ); }
@@ -4558,7 +4558,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,if (btrfs_leaf_free_space (root, leaf) < total_size) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "not enough freespace need %u have %d\n" , +btrfs_crit (root->fs_info,"not enough freespace need %u have %d" , total_size,btrfs_leaf_free_space (root, leaf));BUG (); }
@@ -4568,7 +4568,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,if (old_data < data_end) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "slot %d old_data %d data_end %d\n" , +btrfs_crit (root->fs_info,"slot %d old_data %d data_end %d" , slot, old_data, data_end);BUG_ON (1 ); }
@@ -5303,7 +5303,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,if (!left_start_ctransid || !right_start_ctransid) {WARN (1 ,KERN_WARNING -"btrfs: btrfs_compare_tree detected " +"BTRFS: btrfs_compare_tree detected " "a change in one of the trees while " "iterating. This is probably a " "bug.\n" );
fs/btrfs/ctree.h +2 -2
@@ -3829,7 +3829,7 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)static inline void assfail (char *expr,char *file,int line) { -printk (KERN_ERR "BTRFS assertion failed: %s, file: %s, line: %d" , +pr_err ("BTRFS: assertion failed: %s, file: %s, line: %d" , expr, file, line);BUG (); }
@@ -3867,7 +3867,7 @@ static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info,if (!(features & flag)) { features |= flag;btrfs_set_super_incompat_flags (disk_super, features); -printk (KERN_INFO "btrfs: setting %llu feature flag\n" , +btrfs_info (fs_info,"setting %llu feature flag" , flag); }spin_unlock (&fs_info->super_lock);
fs/btrfs/delayed-inode.c +5 -5
@@ -1472,9 +1472,9 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,mutex_lock (&delayed_node->mutex); ret =__btrfs_add_delayed_insertion_item (delayed_node, delayed_item);if (unlikely (ret)) { -printk (KERN_ERR "err add delayed dir index item(name: %.*s) " +btrfs_err (root->fs_info,"err add delayed dir index item(name: %.*s) " "into the insertion tree of the delayed node" -"(root id: %llu, inode id: %llu, errno: %d)\n" , +"(root id: %llu, inode id: %llu, errno: %d)" , name_len, name, delayed_node->root->objectid, delayed_node->inode_id, ret);BUG ();
@@ -1544,9 +1544,9 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,mutex_lock (&node->mutex); ret =__btrfs_add_delayed_deletion_item (node, item);if (unlikely (ret)) { -printk (KERN_ERR "err add delayed dir index item(index: %llu) " -"into the deletion tree of the delayed node" -"(root id: %llu, inode id: %llu, errno: %d)\n" , +btrfs_err (root->fs_info,"err add delayed dir index item(index: %llu)" +" into the deletion tree of the delayed node" +"(root id: %llu, inode id: %llu, errno: %d)" , index, node->root->objectid, node->inode_id, ret);BUG ();
fs/btrfs/dev-replace.c +32 -24
144 lines not on this page · raw message
fs/btrfs/dir-item.c +3 -3
@@ -459,7 +459,7 @@ int verify_dir_item(struct btrfs_root *root,u8 type =btrfs_dir_type (leaf, dir_item);if (type >=BTRFS_FT_MAX ) { -printk (KERN_CRIT "btrfs: invalid dir item type: %d\n" , +btrfs_crit (root->fs_info,"invalid dir item type: %d" , (int )type);return 1 ; }
@@ -468,7 +468,7 @@ int verify_dir_item(struct btrfs_root *root, namelen =XATTR_NAME_MAX ;if (btrfs_dir_name_len (leaf, dir_item) > namelen) { -printk (KERN_CRIT "btrfs: invalid dir item name len: %u\n" , +btrfs_crit (root->fs_info,"invalid dir item name len: %u" , (unsigned )btrfs_dir_data_len (leaf, dir_item));return 1 ; }
@@ -476,7 +476,7 @@ int verify_dir_item(struct btrfs_root *root,/* BTRFS_MAX_XATTR_SIZE is the same for all dir items */ if ((btrfs_dir_data_len (leaf, dir_item) +btrfs_dir_name_len (leaf, dir_item)) >BTRFS_MAX_XATTR_SIZE (root)) { -printk (KERN_CRIT "btrfs: invalid dir item name + data len: %u + %u\n" , +btrfs_crit (root->fs_info,"invalid dir item name + data len: %u + %u" , (unsigned )btrfs_dir_name_len (leaf, dir_item), (unsigned )btrfs_dir_data_len (leaf, dir_item));return 1 ;
fs/btrfs/disk-io.c +54 -52
362 lines not on this page · raw message
fs/btrfs/extent-tree.c +8 -6
@@ -6636,12 +6636,12 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes,int index =0 ;spin_lock (&info->lock); -printk (KERN_INFO "space_info %llu has %llu free, is %sfull\n" , +printk (KERN_INFO "BTRFS: space_info %llu has %llu free, is %sfull\n" , info->flags, info->total_bytes - info->bytes_used - info->bytes_pinned - info->bytes_reserved - info->bytes_readonly, (info->full) ?"" :"not " ); - printk(KERN_INFO "space_info total=%llu, used=%llu, pinned=%llu, " + printk(KERN_INFO "BTRFS: space_info total=%llu, used=%llu, pinned=%llu, " "reserved=%llu, may_use=%llu, readonly=%llu\n", info->total_bytes, info->bytes_used, info->bytes_pinned, info->bytes_reserved, info->bytes_may_use,
@@ -6655,7 +6655,9 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes, again:list_for_each_entry (cache, &info->block_groups[index], list) {spin_lock (&cache->lock); -printk (KERN_INFO "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %s\n" , +printk (KERN_INFO "BTRFS: " +"block group %llu has %llu bytes, " +"%llu used %llu pinned %llu reserved %s\n" , cache->key.objectid, cache->key.offset,btrfs_block_group_used (&cache->item), cache->pinned, cache->reserved, cache->ro ?"[readonly]" :"" );
@@ -7018,7 +7020,7 @@ again: /*DEFAULT_RATELIMIT_BURST*/ 1);if (__ratelimit (&_rs))WARN (1 ,KERN_DEBUG -"btrfs: block rsv returned %d\n" , ret); +"BTRFS: block rsv returned %d\n" , ret); } try_reserve: ret = reserve_metadata_bytes(root, block_rsv, blocksize,
@@ -7766,7 +7768,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,btrfs_end_transaction_throttle (trans, tree_root);if (!for_reloc &&btrfs_need_cleaner_sleep (root)) { -pr_debug ("btrfs: drop snapshot early exit\n" ); +pr_debug ("BTRFS: drop snapshot early exit\n" ); err = -EAGAIN ; goto out_free; }
@@ -8427,7 +8429,7 @@ static void __link_block_group(struct btrfs_space_info *space_info, &space_info->kobj,"%s" , get_raid_name(index));if (ret) { -pr_warn ("btrfs: failed to add kobject for block cache. ignoring.\n" ); +pr_warn ("BTRFS: failed to add kobject for block cache. ignoring.\n" );kobject_put (&space_info->kobj); } }
fs/btrfs/extent_io.c +37 -24
135 lines not on this page · raw message
fs/btrfs/file-item.c +2 -2
@@ -246,8 +246,8 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, offset + bvec->bv_len -1 , EXTENT_NODATASUM, GFP_NOFS); }else { -printk (KERN_INFO "btrfs no csum found " -"for inode %llu start %llu\n" , +btrfs_info (BTRFS_I (inode)->root->fs_info, +"no csum found for inode %llu start %llu" ,btrfs_ino (inode), offset); } item =NULL ;
fs/btrfs/free-space-cache.c +11 -10
@@ -347,8 +347,8 @@ static int io_ctl_prepare_pages(struct io_ctl *io_ctl, struct inode *inode,btrfs_readpage (NULL , page);lock_page (page);if (!PageUptodate (page)) { -printk (KERN_ERR "btrfs: error reading free " -"space cache\n" ); +btrfs_err (BTRFS_I (inode)->root->fs_info, +"error reading free space cache" );io_ctl_drop_pages (io_ctl);return -EIO ; }
@@ -405,7 +405,7 @@ static int io_ctl_check_generation(struct io_ctl *io_ctl, u64 generation) gen = io_ctl->cur;if (le64_to_cpu (*gen) != generation) { -printk_ratelimited (KERN_ERR "btrfs: space cache generation " +printk_ratelimited (KERN_ERR "BTRFS: space cache generation " "(%Lu) does not match inode (%Lu)\n" , *gen, generation);io_ctl_unmap_page (io_ctl);
@@ -463,7 +463,7 @@ static int io_ctl_check_crc(struct io_ctl *io_ctl, int index) PAGE_CACHE_SIZE - offset);btrfs_csum_final (crc, (char *)&crc);if (val != crc) { -printk_ratelimited (KERN_ERR "btrfs: csum mismatch on free " +printk_ratelimited (KERN_ERR "BTRFS: csum mismatch on free " "space cache\n" );io_ctl_unmap_page (io_ctl);return -EIO ;
@@ -1902,7 +1902,7 @@ out:spin_unlock (&ctl->tree_lock);if (ret) { -printk (KERN_CRIT "btrfs: unable to add free space :%d\n" , ret); +printk (KERN_CRIT "BTRFS: unable to add free space :%d\n" , ret);ASSERT (ret != -EEXIST ); }
@@ -2011,14 +2011,15 @@ void btrfs_dump_free_space(struct btrfs_block_group_cache *block_group, info = rb_entry(n, struct btrfs_free_space, offset_index);if (info->bytes >= bytes && !block_group->ro) count++; -printk (KERN_CRIT "entry offset %llu, bytes %llu, bitmap %s\n" , - info->offset, info->bytes, +btrfs_crit (block_group->fs_info, +"entry offset %llu, bytes %llu, bitmap %s" , + info->offset, info->bytes, (info->bitmap) ?"yes" :"no" ); } -printk (KERN_INFO "block group has cluster?: %s\n" , +btrfs_info (block_group->fs_info,"block group has cluster?: %s" ,list_empty (&block_group->cluster_list) ?"no" :"yes" ); -printk (KERN_INFO "%d blocks of free space at or bigger than bytes is" -"\n" , count); +btrfs_info (block_group->fs_info, +"%d blocks of free space at or bigger than bytes is" , count); }void btrfs_init_free_space_ctl (struct btrfs_block_group_cache *block_group)
fs/btrfs/inode.c +2 -2
@@ -6963,8 +6963,8 @@ static void btrfs_end_dio_bio(struct bio *bio, int err)struct btrfs_dio_private *dip = bio->bi_private;if (err) { -printk (KERN_ERR "btrfs direct IO failed ino %llu rw %lu " -"sector %#Lx len %u err no %d\n" , +btrfs_err (BTRFS_I (dip->inode)->root->fs_info, +"direct IO failed ino %llu rw %lu sector %#Lx len %u err no %d" ,btrfs_ino (dip->inode), bio->bi_rw, (unsigned long long )bio->bi_sector, bio->bi_size, err); dip->errors =1 ;
fs/btrfs/ioctl.c +15 -15
@@ -1255,7 +1255,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,break ;if (btrfs_defrag_cancelled (root->fs_info)) { -printk (KERN_DEBUG "btrfs: defrag_file cancelled\n" ); +printk (KERN_DEBUG "BTRFS: defrag_file cancelled\n" ); ret = -EAGAIN ;break ; }
@@ -1417,20 +1417,20 @@ static noinline int btrfs_ioctl_resize(struct file *file, ret = -EINVAL ; goto out_free; } -printk (KERN_INFO "btrfs: resizing devid %llu\n" , devid); +btrfs_info (root->fs_info,"resizing devid %llu" , devid); } device =btrfs_find_device (root->fs_info, devid,NULL ,NULL );if (!device) { -printk (KERN_INFO "btrfs: resizer unable to find device %llu\n" , +btrfs_info (root->fs_info,"resizer unable to find device %llu" , devid); ret = -ENODEV ; goto out_free; }if (!device->writeable) { -printk (KERN_INFO "btrfs: resizer unable to apply on " -"readonly device %llu\n" , +btrfs_info (root->fs_info, +"resizer unable to apply on readonly device %llu" , devid); ret = -EPERM ; goto out_free;
@@ -1482,7 +1482,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,do_div (new_size, root->sectorsize); new_size *= root->sectorsize; -printk_in_rcu (KERN_INFO "btrfs: new size for %s is %llu\n" , +printk_in_rcu (KERN_INFO "BTRFS: new size for %s is %llu\n" ,rcu_str_deref (device->name), new_size);if (new_size > old_size) {
@@ -1543,8 +1543,8 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file, src_inode =file_inode (src.file);if (src_inode->i_sb !=file_inode (file)->i_sb) { -printk (KERN_INFO "btrfs: Snapshot src from " -"another FS\n" ); +btrfs_info (BTRFS_I (src_inode)->root->fs_info, +"Snapshot src from another FS" ); ret = -EINVAL ; }else { ret = btrfs_mksubvol(&file->f_path, name, namelen,
@@ -1911,7 +1911,7 @@ static noinline int search_ioctl(struct inode *inode, key.offset = (u64)-1 ; root =btrfs_read_fs_root_no_name (info, &key);if (IS_ERR (root)) { -printk (KERN_ERR "could not find root %llu\n" , +printk (KERN_ERR "BTRFS: could not find root %llu\n" , sk->tree_id);btrfs_free_path (path);return -ENOENT ;
@@ -2001,7 +2001,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, key.offset = (u64)-1 ; root =btrfs_read_fs_root_no_name (info, &key);if (IS_ERR (root)) { -printk (KERN_ERR "could not find root %llu\n" , tree_id); +printk (KERN_ERR "BTRFS: could not find root %llu\n" , tree_id); ret = -ENOENT ; goto out; }
@@ -3344,8 +3344,8 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)if (IS_ERR_OR_NULL (di)) {btrfs_free_path (path);btrfs_end_transaction (trans, root); -printk (KERN_ERR "Umm, you don't have the default dir item, " -"this isn't going to work\n" ); +btrfs_err (new_root->fs_info,"Umm, you don't have the default dir" +"item, this isn't going to work" ); ret = -ENOENT ; goto out; }
@@ -4446,8 +4446,8 @@ static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg) len =strnlen (label,BTRFS_LABEL_SIZE );if (len ==BTRFS_LABEL_SIZE ) { -pr_warn ("btrfs: label is too long, return the first %zu bytes\n" , - --len); +btrfs_warn (root->fs_info, +"label is too long, return the first %zu bytes" , --len); } ret =copy_to_user (arg, label, len);
@@ -4470,7 +4470,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)return -EFAULT ;if (strnlen (label,BTRFS_LABEL_SIZE ) ==BTRFS_LABEL_SIZE ) { -pr_err ("btrfs: unable to set label with more than %d bytes\n" , +btrfs_err (root->fs_info,"unable to set label with more than %d bytes" ,BTRFS_LABEL_SIZE -1 );return -EINVAL ; }
fs/btrfs/lzo.c +3 -3
@@ -141,7 +141,7 @@ static int lzo_compress_pages(struct list_head *ws, ret =lzo1x_1_compress (data_in, in_len, workspace->cbuf, &out_len, workspace->mem);if (ret !=LZO_E_OK ) { -printk (KERN_DEBUG "btrfs deflate in loop returned %d\n" , +printk (KERN_DEBUG "BTRFS: deflate in loop returned %d\n" , ret); ret =-1 ; goto out;
@@ -357,7 +357,7 @@ cont:if (need_unmap)kunmap (pages_in[page_in_index -1 ]);if (ret !=LZO_E_OK ) { -printk (KERN_WARNING "btrfs decompress failed\n" ); +printk (KERN_WARNING "BTRFS: decompress failed\n" ); ret =-1 ;break ; }
@@ -401,7 +401,7 @@ static int lzo_decompress(struct list_head *ws, unsigned char *data_in, out_len =PAGE_CACHE_SIZE ; ret =lzo1x_decompress_safe (data_in, in_len, workspace->buf, &out_len);if (ret !=LZO_E_OK ) { -printk (KERN_WARNING "btrfs decompress failed!\n" ); +printk (KERN_WARNING "BTRFS: decompress failed!\n" ); ret =-1 ; goto out; }
fs/btrfs/ordered-data.c +7 -5
@@ -336,13 +336,14 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode, entry->len); *file_offset = dec_end;if (dec_start > dec_end) { -printk (KERN_CRIT "bad ordering dec_start %llu end %llu\n" , - dec_start, dec_end); +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordering dec_start %llu end %llu" , dec_start, dec_end); } to_dec = dec_end - dec_start;if (to_dec > entry->bytes_left) { -printk (KERN_CRIT "bad ordered accounting left %llu size %llu\n" , - entry->bytes_left, to_dec); +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordered accounting left %llu size %llu" , + entry->bytes_left, to_dec); } entry->bytes_left -= to_dec;if (!uptodate)
@@ -401,7 +402,8 @@ have_entry: }if (io_size > entry->bytes_left) { -printk (KERN_CRIT "bad ordered accounting left %llu size %llu\n" , +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordered accounting left %llu size %llu" , entry->bytes_left, io_size); } entry->bytes_left -= io_size;
fs/btrfs/print-tree.c +1 -1
@@ -154,7 +154,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset, u32 item_size) {if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +pr_warn ("BTRFS: uuid item with illegal size %lu!\n" , (unsigned long )item_size);return ; }
fs/btrfs/qgroup.c +15 -13
@@ -301,16 +301,16 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (btrfs_qgroup_status_version (l, ptr) !=BTRFS_QGROUP_STATUS_VERSION ) { -printk (KERN_ERR -"btrfs: old qgroup version, quota disabled\n" ); +btrfs_err (fs_info, +"old qgroup version, quota disabled" ); goto out; }if (btrfs_qgroup_status_generation (l, ptr) != fs_info->generation) { flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; -printk (KERN_ERR -"btrfs: qgroup generation mismatch, " -"marked as inconsistent\n" ); +btrfs_err (fs_info, +"qgroup generation mismatch, " +"marked as inconsistent" ); } fs_info->qgroup_flags =btrfs_qgroup_status_flags (l, ptr);
@@ -325,7 +325,7 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info) qgroup =find_qgroup_rb (fs_info, found_key.offset);if ((qgroup && found_key.type ==BTRFS_QGROUP_INFO_KEY ) || (!qgroup && found_key.type ==BTRFS_QGROUP_LIMIT_KEY )) { -printk (KERN_ERR "btrfs: inconsitent qgroup config\n" ); +btrfs_err (fs_info,"inconsitent qgroup config" ); flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; }if (!qgroup) {
@@ -396,8 +396,8 @@ next1: ret =add_relation_rb (fs_info, found_key.objectid, found_key.offset);if (ret == -ENOENT ) { -printk (KERN_WARNING -"btrfs: orphan qgroup relation 0x%llx->0x%llx\n" , +btrfs_warn (fs_info, +"orphan qgroup relation 0x%llx->0x%llx" , found_key.objectid, found_key.offset); ret =0 ;/* ignore the error */ }
@@ -1159,7 +1159,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, limit->rsv_excl);if (ret) { fs_info->qgroup_flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; -printk (KERN_INFO "unable to update quota limit for %llu\n" , +btrfs_info (fs_info,"unable to update quota limit for %llu" , qgroupid); }
@@ -1833,7 +1833,9 @@ void assert_qgroups_uptodate(struct btrfs_trans_handle *trans) {if (list_empty (&trans->qgroup_ref_list) && !trans->delayed_ref_elem.seq)return ; -pr_err ("btrfs: qgroups not uptodate in trans handle %p: list is%s empty, seq is %#x.%x\n" , +btrfs_err (trans->root->fs_info, +"qgroups not uptodate in trans handle %p: list is%s empty, " +"seq is %#x.%x" , trans,list_empty (&trans->qgroup_ref_list) ?"" :" not" , (u32)(trans->delayed_ref_elem.seq >>32 ), (u32 )trans->delayed_ref_elem.seq);
@@ -2030,10 +2032,10 @@ out:mutex_unlock (&fs_info->qgroup_rescan_lock);if (err >=0 ) { -pr_info ("btrfs: qgroup scan completed%s\n" , +btrfs_info (fs_info,"qgroup scan completed%s" , err ==2 ?" (inconsistency flag cleared)" :"" ); }else { -pr_err ("btrfs: qgroup scan failed with %d\n" , err); +btrfs_err (fs_info,"qgroup scan failed with %d" , err); }complete_all (&fs_info->qgroup_rescan_completion);
@@ -2089,7 +2091,7 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,if (ret) { err: -pr_info ("btrfs: qgroup_rescan_init failed with %d\n" , ret); +btrfs_info (fs_info,"qgroup_rescan_init failed with %d" , ret);return ret; }
fs/btrfs/reada.c +5 -4
@@ -189,8 +189,8 @@ static int __readahead_hook(struct btrfs_root *root, struct extent_buffer *eb,*/ #ifdef DEBUG if (rec->generation != generation) { -printk (KERN_DEBUG "generation mismatch for " -"(%llu,%d,%llu) %llu != %llu\n" , +btrfs_debug (root->fs_info, +"generation mismatch for (%llu,%d,%llu) %llu != %llu" , key.objectid, key.type, key.offset, rec->generation, generation); }
@@ -365,8 +365,9 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, goto error;if (bbio->num_stripes >BTRFS_MAX_MIRRORS ) { -printk (KERN_ERR "btrfs readahead: more than %d copies not " -"supported" ,BTRFS_MAX_MIRRORS ); +btrfs_err (root->fs_info, +"readahead: more than %d copies not supported" , +BTRFS_MAX_MIRRORS ); goto error; }
fs/btrfs/relocation.c +2 -2
@@ -4245,7 +4245,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start) goto out; } -printk (KERN_INFO "btrfs: relocating block group %llu flags %llu\n" , +btrfs_info (extent_root->fs_info,"relocating block group %llu flags %llu" , rc->block_group->key.objectid, rc->block_group->flags); ret =btrfs_start_delalloc_roots (fs_info,0 );
@@ -4267,7 +4267,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start)if (rc->extents_found ==0 )break ; -printk (KERN_INFO "btrfs: found %llu extents\n" , +btrfs_info (extent_root->fs_info,"found %llu extents" , rc->extents_found);if (rc->stage ==MOVE_DATA_EXTENTS && rc->found_file_extent) {
fs/btrfs/root-tree.c +2 -2
@@ -44,7 +44,7 @@ static void btrfs_read_root_item(struct extent_buffer *eb, int slot,if (!need_reset &&btrfs_root_generation (item) !=btrfs_root_generation_v2 (item)) {if (btrfs_root_generation_v2 (item) !=0 ) { -printk (KERN_WARNING "btrfs: mismatching " +printk (KERN_WARNING "BTRFS: mismatching " "generation and generation_v2 " "found in root item. This root " "was probably mounted with an "
@@ -154,7 +154,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_rootif (ret !=0 ) {btrfs_print_leaf (root, path->nodes[0 ]); -printk (KERN_CRIT "unable to update root key %llu %u %llu\n" , +btrfs_crit (root->fs_info,"unable to update root key %llu %u %llu" , key->objectid, key->type, key->offset);BUG_ON (1 ); }
fs/btrfs/scrub.c +27 -23
146 lines not on this page · raw message
fs/btrfs/send.c +2 -2
@@ -1278,7 +1278,7 @@ static int find_extent_clone(struct send_ctx *sctx,if (!backref_ctx->found_itself) {/* found a bug in backref code? */ ret = -EIO ; -printk (KERN_ERR "btrfs: ERROR did not find backref in " +btrfs_err (sctx->send_root->fs_info,"did not find backref in " "send_root. inode=%llu, offset=%llu, " "disk_byte=%llu found extent=%llu\n" , ino, data_offset, disk_byte, found_key.objectid);
@@ -4706,7 +4706,7 @@ join_trans:spin_unlock (&send_root->root_item_lock);if (ctransid != start_ctransid) { -WARN (1 ,KERN_WARNING "btrfs: the root that you're trying to " +WARN (1 ,KERN_WARNING "BTRFS: the root that you're trying to " "send was modified in between. This is " "probably a bug.\n" ); ret = -EIO ;
fs/btrfs/super.c +49 -55
318 lines not on this page · raw message
fs/btrfs/sysfs.c +1 -1
@@ -374,7 +374,7 @@ static ssize_t btrfs_label_store(struct kobject *kobj,int ret;if (len >=BTRFS_LABEL_SIZE ) { -pr_err ("btrfs: unable to set label with more than %d bytes\n" , +pr_err ("BTRFS: unable to set label with more than %d bytes\n" ,BTRFS_LABEL_SIZE -1 );return -EINVAL ; }
fs/btrfs/tests/extent-io-tests.c +3 -1
@@ -56,7 +56,9 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end,cond_resched (); loops++;if (loops >100000 ) { -printk (KERN_ERR "stuck in a loop, start %Lu, end %Lu, nr_pages %lu, ret %d\n" , start, end, nr_pages, ret); +btrfs_err (BTRFS_I (inode)->root->fs_info, +"stuck in a loop, start %Lu, end %Lu, nr_pages %lu, ret %d" , + start, end, nr_pages, ret);break ; } }
fs/btrfs/transaction.c +4 -4
@@ -198,10 +198,10 @@ loop:*/ smp_mb ();if (!list_empty (&fs_info->tree_mod_seq_list)) -WARN (1 ,KERN_ERR "btrfs: tree_mod_seq_list not empty when " +WARN (1 ,KERN_ERR "BTRFS: tree_mod_seq_list not empty when " "creating a fresh transaction\n" );if (!RB_EMPTY_ROOT (&fs_info->tree_mod_log)) -WARN (1 ,KERN_ERR "btrfs: tree_mod_log rb tree not empty when " +WARN (1 ,KERN_ERR "BTRFS: tree_mod_log rb tree not empty when " "creating a fresh transaction\n" );atomic64_set (&fs_info->tree_mod_seq,0 );
@@ -1107,7 +1107,7 @@ int btrfs_defrag_root(struct btrfs_root *root)break ;if (btrfs_defrag_cancelled (root->fs_info)) { -printk (KERN_DEBUG "btrfs: defrag_root cancelled\n" ); +pr_debug ("BTRFS: defrag_root cancelled\n" ); ret = -EAGAIN ;break ; }
@@ -1981,7 +1981,7 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root)list_del_init (&root->root_list);spin_unlock (&fs_info->trans_lock); -pr_debug ("btrfs: cleaner removing %llu\n" , root->objectid); +pr_debug ("BTRFS: cleaner removing %llu\n" , root->objectid);btrfs_kill_all_delayed_nodes (root);
fs/btrfs/uuid-tree.c +7 -6
@@ -69,7 +69,7 @@ static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, u8 *uuid, ret = -ENOENT ;if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (uuid_root->fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); goto out; }
@@ -137,7 +137,8 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, offset =btrfs_item_ptr_offset (eb, slot); offset +=btrfs_item_size_nr (eb, slot) -sizeof (subid_le); }else if (ret <0 ) { -pr_warn ("btrfs: insert uuid item failed %d (0x%016llx, 0x%016llx) type %u!\n" , +btrfs_warn (uuid_root->fs_info,"insert uuid item failed %d " +"(0x%016llx, 0x%016llx) type %u!" , ret, (unsigned long long )key.objectid, (unsigned long long )key.offset, type); goto out;
@@ -183,7 +184,7 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans, ret =btrfs_search_slot (trans, uuid_root, &key, path,-1 ,1 );if (ret <0 ) { -pr_warn ("btrfs: error %d while searching for uuid item!\n" , +btrfs_warn (uuid_root->fs_info,"error %d while searching for uuid item!" , ret); goto out; }
@@ -197,7 +198,7 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans, offset =btrfs_item_ptr_offset (eb, slot); item_size =btrfs_item_size_nr (eb, slot);if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (uuid_root->fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); ret = -ENOENT ; goto out;
@@ -299,7 +300,7 @@ again_search_slot: offset =btrfs_item_ptr_offset (leaf, slot); item_size =btrfs_item_size_nr (leaf, slot);if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); goto skip; }
@@ -349,6 +350,6 @@ skip: out:btrfs_free_path (path);if (ret) -pr_warn ("btrfs: btrfs_uuid_tree_iterate failed %d\n" , ret); +btrfs_warn (fs_info,"btrfs_uuid_tree_iterate failed %d" , ret);return 0 ; }
fs/btrfs/volumes.c +44 -45
270 lines not on this page · raw message
fs/btrfs/zlib.c +4 -4
@@ -97,7 +97,7 @@ static int zlib_compress_pages(struct list_head *ws, *total_in =0 ;if (Z_OK !=zlib_deflateInit (&workspace->def_strm,3 )) { -printk (KERN_WARNING "btrfs: deflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: deflateInit failed\n" ); ret =-1 ; goto out; }
@@ -125,7 +125,7 @@ static int zlib_compress_pages(struct list_head *ws,while (workspace->def_strm.total_in < len) { ret =zlib_deflate (&workspace->def_strm,Z_SYNC_FLUSH );if (ret !=Z_OK ) { -printk (KERN_DEBUG "btrfs: deflate in loop returned %d\n" , +printk (KERN_DEBUG "BTRFS: deflate in loop returned %d\n" , ret);zlib_deflateEnd (&workspace->def_strm); ret =-1 ;
@@ -252,7 +252,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in, }if (Z_OK !=zlib_inflateInit2 (&workspace->inf_strm, wbits)) { -printk (KERN_WARNING "btrfs: inflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: inflateInit failed\n" );return -1 ; }while (workspace->inf_strm.total_in < srclen) {
@@ -336,7 +336,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in, }if (Z_OK !=zlib_inflateInit2 (&workspace->inf_strm, wbits)) { -printk (KERN_WARNING "btrfs: inflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: inflateInit failed\n" );return -1 ; }
Signature · 1 line
1.7.9.5
Quoted 5 lines · Frank Holton
Convert all applicable cases of printk and pr_* to the btrfs_* macros.
Fix all uses of the BTRFS prefix.
Signed-off-by Frank Holton <[email protected]>
There are tailing whitespaces everywhere. Please run this through checkpatch.pl so you can fix all those up, or use
let c_space_errors = 1
in your .vimrc so you can see them. Thanks,
Josef
PATCH v5 1/1 Btrfs: convert printk to btrfs_ and fix BTRFS prefix
In reply to Frank HoltonConvert all applicable cases of printk and pr_* to the btrfs_* macros.
Fix all uses of the BTRFS prefix.
---
v5 - fix trailing spaces
v4 - rebase to master btrfs-next, compile and run tested v3 - cleanup problems noted by David, convert prefix to BTRFS v2 - changed pr_ and printk to btrfs_ output macro
fs/btrfs/compression.c | 12 ++--- fs/btrfs/ctree.c | 16 +++--- fs/btrfs/ctree.h | 4 +- fs/btrfs/delayed-inode.c | 10 ++-- fs/btrfs/dev-replace.c | 56 +++++++++++--------- fs/btrfs/dir-item.c | 6 +-- fs/btrfs/disk-io.c | 106 +++++++++++++++++++------------------- fs/btrfs/extent-tree.c | 14 ++--- fs/btrfs/extent_io.c | 61 +++++++++++++--------- fs/btrfs/file-item.c | 4 +- fs/btrfs/free-space-cache.c | 21 ++++---- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 30 +++++------ fs/btrfs/lzo.c | 6 +-- fs/btrfs/ordered-data.c | 12 +++-- fs/btrfs/print-tree.c | 2 +- fs/btrfs/qgroup.c | 28 +++++----- fs/btrfs/reada.c | 9 ++-- fs/btrfs/relocation.c | 4 +- fs/btrfs/root-tree.c | 4 +- fs/btrfs/scrub.c | 50 +++++++++--------- fs/btrfs/send.c | 4 +- fs/btrfs/super.c | 104 ++++++++++++++++++------------------- fs/btrfs/sysfs.c | 2 +- fs/btrfs/tests/extent-io-tests.c | 4 +- fs/btrfs/transaction.c | 8 +-- fs/btrfs/uuid-tree.c | 13 ++--- fs/btrfs/volumes.c | 89 ++++++++++++++++---------------- fs/btrfs/zlib.c | 8 +-- 29 files changed, 361 insertions(+), 330 deletions(-)
fs/btrfs/compression.c +6 -6
@@ -128,11 +128,10 @@ static int check_compressed_csum(struct inode *inode,kunmap_atomic (kaddr);if (csum != *cb_sum) { -printk (KERN_INFO "btrfs csum failed ino %llu " -"extent %llu csum %u " -"wanted %u mirror %d\n" , -btrfs_ino (inode), disk_start, csum, *cb_sum, - cb->mirror_num); +btrfs_info (BTRFS_I (inode)->root->fs_info, +"csum failed ino %llu extent %llu csum %u wanted %u mirror %d" , +btrfs_ino (inode), disk_start, csum, *cb_sum, + cb->mirror_num); ret = -EIO ; goto fail; }
@@ -412,7 +411,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,bio_add_page (bio, page,PAGE_CACHE_SIZE ,0 ); }if (bytes_left <PAGE_CACHE_SIZE ) { -printk ("bytes left %lu compress len %lu nr %lu\n" , +btrfs_info (BTRFS_I (inode)->root->fs_info, +"bytes left %lu compress len %lu nr %lu" , bytes_left, cb->compressed_len, cb->nr_pages); } bytes_left -=PAGE_CACHE_SIZE ;
fs/btrfs/ctree.c +8 -8
@@ -1286,8 +1286,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq) old =read_tree_block (root, logical, blocksize,0 );if (WARN_ON (!old || !extent_buffer_uptodate (old))) {free_extent_buffer (old); -pr_warn ("btrfs: failed to read tree block %llu from get_old_root\n" , - logical); +btrfs_warn (root->fs_info, +"failed to read tree block %llu from get_old_root" , logical); }else { eb =btrfs_clone_extent_buffer (old);free_extent_buffer (old);
@@ -3404,8 +3404,8 @@ noinline int btrfs_leaf_free_space(struct btrfs_root *root,int ret; ret =BTRFS_LEAF_DATA_SIZE (root) -leaf_space_used (leaf,0 , nritems);if (ret <0 ) { -printk (KERN_CRIT "leaf free space ret %d, leaf data size %lu, " -"used %d nritems %d\n" , +btrfs_crit (root->fs_info, +"leaf free space ret %d, leaf data size %lu, used %d nritems %d" , ret, (unsigned long )BTRFS_LEAF_DATA_SIZE (root),leaf_space_used (leaf,0 , nritems), nritems); }
@@ -4495,7 +4495,7 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,BUG_ON (slot <0 );if (slot >= nritems) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "slot %d too large, nritems %d\n" , +btrfs_crit (root->fs_info,"slot %d too large, nritems %d" , slot, nritems);BUG_ON (1 ); }
@@ -4558,7 +4558,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,if (btrfs_leaf_free_space (root, leaf) < total_size) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "not enough freespace need %u have %d\n" , +btrfs_crit (root->fs_info,"not enough freespace need %u have %d" , total_size,btrfs_leaf_free_space (root, leaf));BUG (); }
@@ -4568,7 +4568,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,if (old_data < data_end) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "slot %d old_data %d data_end %d\n" , +btrfs_crit (root->fs_info,"slot %d old_data %d data_end %d" , slot, old_data, data_end);BUG_ON (1 ); }
@@ -5303,7 +5303,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,if (!left_start_ctransid || !right_start_ctransid) {WARN (1 ,KERN_WARNING -"btrfs: btrfs_compare_tree detected " +"BTRFS: btrfs_compare_tree detected " "a change in one of the trees while " "iterating. This is probably a " "bug.\n" );
fs/btrfs/ctree.h +2 -2
@@ -3829,7 +3829,7 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)static inline void assfail (char *expr,char *file,int line) { -printk (KERN_ERR "BTRFS assertion failed: %s, file: %s, line: %d" , +pr_err ("BTRFS: assertion failed: %s, file: %s, line: %d" , expr, file, line);BUG (); }
@@ -3867,7 +3867,7 @@ static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info,if (!(features & flag)) { features |= flag;btrfs_set_super_incompat_flags (disk_super, features); -printk (KERN_INFO "btrfs: setting %llu feature flag\n" , +btrfs_info (fs_info,"setting %llu feature flag" , flag); }spin_unlock (&fs_info->super_lock);
fs/btrfs/delayed-inode.c +5 -5
@@ -1472,9 +1472,9 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,mutex_lock (&delayed_node->mutex); ret =__btrfs_add_delayed_insertion_item (delayed_node, delayed_item);if (unlikely (ret)) { -printk (KERN_ERR "err add delayed dir index item(name: %.*s) " +btrfs_err (root->fs_info,"err add delayed dir index item(name: %.*s) " "into the insertion tree of the delayed node" -"(root id: %llu, inode id: %llu, errno: %d)\n" , +"(root id: %llu, inode id: %llu, errno: %d)" , name_len, name, delayed_node->root->objectid, delayed_node->inode_id, ret);BUG ();
@@ -1544,9 +1544,9 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,mutex_lock (&node->mutex); ret =__btrfs_add_delayed_deletion_item (node, item);if (unlikely (ret)) { -printk (KERN_ERR "err add delayed dir index item(index: %llu) " -"into the deletion tree of the delayed node" -"(root id: %llu, inode id: %llu, errno: %d)\n" , +btrfs_err (root->fs_info,"err add delayed dir index item(index: %llu)" +" into the deletion tree of the delayed node" +"(root id: %llu, inode id: %llu, errno: %d)" , index, node->root->objectid, node->inode_id, ret);BUG ();
fs/btrfs/dev-replace.c +32 -24
144 lines not on this page · raw message
fs/btrfs/dir-item.c +3 -3
@@ -459,7 +459,7 @@ int verify_dir_item(struct btrfs_root *root,u8 type =btrfs_dir_type (leaf, dir_item);if (type >=BTRFS_FT_MAX ) { -printk (KERN_CRIT "btrfs: invalid dir item type: %d\n" , +btrfs_crit (root->fs_info,"invalid dir item type: %d" , (int )type);return 1 ; }
@@ -468,7 +468,7 @@ int verify_dir_item(struct btrfs_root *root, namelen =XATTR_NAME_MAX ;if (btrfs_dir_name_len (leaf, dir_item) > namelen) { -printk (KERN_CRIT "btrfs: invalid dir item name len: %u\n" , +btrfs_crit (root->fs_info,"invalid dir item name len: %u" , (unsigned )btrfs_dir_data_len (leaf, dir_item));return 1 ; }
@@ -476,7 +476,7 @@ int verify_dir_item(struct btrfs_root *root,/* BTRFS_MAX_XATTR_SIZE is the same for all dir items */ if ((btrfs_dir_data_len (leaf, dir_item) +btrfs_dir_name_len (leaf, dir_item)) >BTRFS_MAX_XATTR_SIZE (root)) { -printk (KERN_CRIT "btrfs: invalid dir item name + data len: %u + %u\n" , +btrfs_crit (root->fs_info,"invalid dir item name + data len: %u + %u" , (unsigned )btrfs_dir_name_len (leaf, dir_item), (unsigned )btrfs_dir_data_len (leaf, dir_item));return 1 ;
fs/btrfs/disk-io.c +54 -52
362 lines not on this page · raw message
fs/btrfs/extent-tree.c +8 -6
@@ -6636,12 +6636,12 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes,int index =0 ;spin_lock (&info->lock); -printk (KERN_INFO "space_info %llu has %llu free, is %sfull\n" , +printk (KERN_INFO "BTRFS: space_info %llu has %llu free, is %sfull\n" , info->flags, info->total_bytes - info->bytes_used - info->bytes_pinned - info->bytes_reserved - info->bytes_readonly, (info->full) ?"" :"not " ); - printk(KERN_INFO "space_info total=%llu, used=%llu, pinned=%llu, " + printk(KERN_INFO "BTRFS: space_info total=%llu, used=%llu, pinned=%llu, " "reserved=%llu, may_use=%llu, readonly=%llu\n", info->total_bytes, info->bytes_used, info->bytes_pinned, info->bytes_reserved, info->bytes_may_use,
@@ -6655,7 +6655,9 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes, again:list_for_each_entry (cache, &info->block_groups[index], list) {spin_lock (&cache->lock); -printk (KERN_INFO "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %s\n" , +printk (KERN_INFO "BTRFS: " +"block group %llu has %llu bytes, " +"%llu used %llu pinned %llu reserved %s\n" , cache->key.objectid, cache->key.offset,btrfs_block_group_used (&cache->item), cache->pinned, cache->reserved, cache->ro ?"[readonly]" :"" );
@@ -7018,7 +7020,7 @@ again: /*DEFAULT_RATELIMIT_BURST*/ 1);if (__ratelimit (&_rs))WARN (1 ,KERN_DEBUG -"btrfs: block rsv returned %d\n" , ret); +"BTRFS: block rsv returned %d\n" , ret); } try_reserve: ret = reserve_metadata_bytes(root, block_rsv, blocksize,
@@ -7766,7 +7768,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,btrfs_end_transaction_throttle (trans, tree_root);if (!for_reloc &&btrfs_need_cleaner_sleep (root)) { -pr_debug ("btrfs: drop snapshot early exit\n" ); +pr_debug ("BTRFS: drop snapshot early exit\n" ); err = -EAGAIN ; goto out_free; }
@@ -8427,7 +8429,7 @@ static void __link_block_group(struct btrfs_space_info *space_info, &space_info->kobj,"%s" , get_raid_name(index));if (ret) { -pr_warn ("btrfs: failed to add kobject for block cache. ignoring.\n" ); +pr_warn ("BTRFS: failed to add kobject for block cache. ignoring.\n" );kobject_put (&space_info->kobj); } }
fs/btrfs/extent_io.c +37 -24
135 lines not on this page · raw message
fs/btrfs/file-item.c +2 -2
@@ -246,8 +246,8 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, offset + bvec->bv_len -1 , EXTENT_NODATASUM, GFP_NOFS); }else { -printk (KERN_INFO "btrfs no csum found " -"for inode %llu start %llu\n" , +btrfs_info (BTRFS_I (inode)->root->fs_info, +"no csum found for inode %llu start %llu" ,btrfs_ino (inode), offset); } item =NULL ;
fs/btrfs/free-space-cache.c +11 -10
@@ -347,8 +347,8 @@ static int io_ctl_prepare_pages(struct io_ctl *io_ctl, struct inode *inode,btrfs_readpage (NULL , page);lock_page (page);if (!PageUptodate (page)) { -printk (KERN_ERR "btrfs: error reading free " -"space cache\n" ); +btrfs_err (BTRFS_I (inode)->root->fs_info, +"error reading free space cache" );io_ctl_drop_pages (io_ctl);return -EIO ; }
@@ -405,7 +405,7 @@ static int io_ctl_check_generation(struct io_ctl *io_ctl, u64 generation) gen = io_ctl->cur;if (le64_to_cpu (*gen) != generation) { -printk_ratelimited (KERN_ERR "btrfs: space cache generation " +printk_ratelimited (KERN_ERR "BTRFS: space cache generation " "(%Lu) does not match inode (%Lu)\n" , *gen, generation);io_ctl_unmap_page (io_ctl);
@@ -463,7 +463,7 @@ static int io_ctl_check_crc(struct io_ctl *io_ctl, int index) PAGE_CACHE_SIZE - offset);btrfs_csum_final (crc, (char *)&crc);if (val != crc) { -printk_ratelimited (KERN_ERR "btrfs: csum mismatch on free " +printk_ratelimited (KERN_ERR "BTRFS: csum mismatch on free " "space cache\n" );io_ctl_unmap_page (io_ctl);return -EIO ;
@@ -1902,7 +1902,7 @@ out:spin_unlock (&ctl->tree_lock);if (ret) { -printk (KERN_CRIT "btrfs: unable to add free space :%d\n" , ret); +printk (KERN_CRIT "BTRFS: unable to add free space :%d\n" , ret);ASSERT (ret != -EEXIST ); }
@@ -2011,14 +2011,15 @@ void btrfs_dump_free_space(struct btrfs_block_group_cache *block_group, info = rb_entry(n, struct btrfs_free_space, offset_index);if (info->bytes >= bytes && !block_group->ro) count++; -printk (KERN_CRIT "entry offset %llu, bytes %llu, bitmap %s\n" , - info->offset, info->bytes, +btrfs_crit (block_group->fs_info, +"entry offset %llu, bytes %llu, bitmap %s" , + info->offset, info->bytes, (info->bitmap) ?"yes" :"no" ); } -printk (KERN_INFO "block group has cluster?: %s\n" , +btrfs_info (block_group->fs_info,"block group has cluster?: %s" ,list_empty (&block_group->cluster_list) ?"no" :"yes" ); -printk (KERN_INFO "%d blocks of free space at or bigger than bytes is" -"\n" , count); +btrfs_info (block_group->fs_info, +"%d blocks of free space at or bigger than bytes is" , count); }void btrfs_init_free_space_ctl (struct btrfs_block_group_cache *block_group)
fs/btrfs/inode.c +2 -2
@@ -6963,8 +6963,8 @@ static void btrfs_end_dio_bio(struct bio *bio, int err)struct btrfs_dio_private *dip = bio->bi_private;if (err) { -printk (KERN_ERR "btrfs direct IO failed ino %llu rw %lu " -"sector %#Lx len %u err no %d\n" , +btrfs_err (BTRFS_I (dip->inode)->root->fs_info, +"direct IO failed ino %llu rw %lu sector %#Lx len %u err no %d" ,btrfs_ino (dip->inode), bio->bi_rw, (unsigned long long )bio->bi_sector, bio->bi_size, err); dip->errors =1 ;
fs/btrfs/ioctl.c +15 -15
@@ -1255,7 +1255,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,break ;if (btrfs_defrag_cancelled (root->fs_info)) { -printk (KERN_DEBUG "btrfs: defrag_file cancelled\n" ); +printk (KERN_DEBUG "BTRFS: defrag_file cancelled\n" ); ret = -EAGAIN ;break ; }
@@ -1417,20 +1417,20 @@ static noinline int btrfs_ioctl_resize(struct file *file, ret = -EINVAL ; goto out_free; } -printk (KERN_INFO "btrfs: resizing devid %llu\n" , devid); +btrfs_info (root->fs_info,"resizing devid %llu" , devid); } device =btrfs_find_device (root->fs_info, devid,NULL ,NULL );if (!device) { -printk (KERN_INFO "btrfs: resizer unable to find device %llu\n" , +btrfs_info (root->fs_info,"resizer unable to find device %llu" , devid); ret = -ENODEV ; goto out_free; }if (!device->writeable) { -printk (KERN_INFO "btrfs: resizer unable to apply on " -"readonly device %llu\n" , +btrfs_info (root->fs_info, +"resizer unable to apply on readonly device %llu" , devid); ret = -EPERM ; goto out_free;
@@ -1482,7 +1482,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,do_div (new_size, root->sectorsize); new_size *= root->sectorsize; -printk_in_rcu (KERN_INFO "btrfs: new size for %s is %llu\n" , +printk_in_rcu (KERN_INFO "BTRFS: new size for %s is %llu\n" ,rcu_str_deref (device->name), new_size);if (new_size > old_size) {
@@ -1543,8 +1543,8 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file, src_inode =file_inode (src.file);if (src_inode->i_sb !=file_inode (file)->i_sb) { -printk (KERN_INFO "btrfs: Snapshot src from " -"another FS\n" ); +btrfs_info (BTRFS_I (src_inode)->root->fs_info, +"Snapshot src from another FS" ); ret = -EINVAL ; }else { ret = btrfs_mksubvol(&file->f_path, name, namelen,
@@ -1911,7 +1911,7 @@ static noinline int search_ioctl(struct inode *inode, key.offset = (u64)-1 ; root =btrfs_read_fs_root_no_name (info, &key);if (IS_ERR (root)) { -printk (KERN_ERR "could not find root %llu\n" , +printk (KERN_ERR "BTRFS: could not find root %llu\n" , sk->tree_id);btrfs_free_path (path);return -ENOENT ;
@@ -2001,7 +2001,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, key.offset = (u64)-1 ; root =btrfs_read_fs_root_no_name (info, &key);if (IS_ERR (root)) { -printk (KERN_ERR "could not find root %llu\n" , tree_id); +printk (KERN_ERR "BTRFS: could not find root %llu\n" , tree_id); ret = -ENOENT ; goto out; }
@@ -3344,8 +3344,8 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)if (IS_ERR_OR_NULL (di)) {btrfs_free_path (path);btrfs_end_transaction (trans, root); -printk (KERN_ERR "Umm, you don't have the default dir item, " -"this isn't going to work\n" ); +btrfs_err (new_root->fs_info,"Umm, you don't have the default dir" +"item, this isn't going to work" ); ret = -ENOENT ; goto out; }
@@ -4446,8 +4446,8 @@ static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg) len =strnlen (label,BTRFS_LABEL_SIZE );if (len ==BTRFS_LABEL_SIZE ) { -pr_warn ("btrfs: label is too long, return the first %zu bytes\n" , - --len); +btrfs_warn (root->fs_info, +"label is too long, return the first %zu bytes" , --len); } ret =copy_to_user (arg, label, len);
@@ -4470,7 +4470,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)return -EFAULT ;if (strnlen (label,BTRFS_LABEL_SIZE ) ==BTRFS_LABEL_SIZE ) { -pr_err ("btrfs: unable to set label with more than %d bytes\n" , +btrfs_err (root->fs_info,"unable to set label with more than %d bytes" ,BTRFS_LABEL_SIZE -1 );return -EINVAL ; }
fs/btrfs/lzo.c +3 -3
@@ -141,7 +141,7 @@ static int lzo_compress_pages(struct list_head *ws, ret =lzo1x_1_compress (data_in, in_len, workspace->cbuf, &out_len, workspace->mem);if (ret !=LZO_E_OK ) { -printk (KERN_DEBUG "btrfs deflate in loop returned %d\n" , +printk (KERN_DEBUG "BTRFS: deflate in loop returned %d\n" , ret); ret =-1 ; goto out;
@@ -357,7 +357,7 @@ cont:if (need_unmap)kunmap (pages_in[page_in_index -1 ]);if (ret !=LZO_E_OK ) { -printk (KERN_WARNING "btrfs decompress failed\n" ); +printk (KERN_WARNING "BTRFS: decompress failed\n" ); ret =-1 ;break ; }
@@ -401,7 +401,7 @@ static int lzo_decompress(struct list_head *ws, unsigned char *data_in, out_len =PAGE_CACHE_SIZE ; ret =lzo1x_decompress_safe (data_in, in_len, workspace->buf, &out_len);if (ret !=LZO_E_OK ) { -printk (KERN_WARNING "btrfs decompress failed!\n" ); +printk (KERN_WARNING "BTRFS: decompress failed!\n" ); ret =-1 ; goto out; }
fs/btrfs/ordered-data.c +7 -5
@@ -336,13 +336,14 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode, entry->len); *file_offset = dec_end;if (dec_start > dec_end) { -printk (KERN_CRIT "bad ordering dec_start %llu end %llu\n" , - dec_start, dec_end); +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordering dec_start %llu end %llu" , dec_start, dec_end); } to_dec = dec_end - dec_start;if (to_dec > entry->bytes_left) { -printk (KERN_CRIT "bad ordered accounting left %llu size %llu\n" , - entry->bytes_left, to_dec); +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordered accounting left %llu size %llu" , + entry->bytes_left, to_dec); } entry->bytes_left -= to_dec;if (!uptodate)
@@ -401,7 +402,8 @@ have_entry: }if (io_size > entry->bytes_left) { -printk (KERN_CRIT "bad ordered accounting left %llu size %llu\n" , +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordered accounting left %llu size %llu" , entry->bytes_left, io_size); } entry->bytes_left -= io_size;
fs/btrfs/print-tree.c +1 -1
@@ -154,7 +154,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset, u32 item_size) {if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +pr_warn ("BTRFS: uuid item with illegal size %lu!\n" , (unsigned long )item_size);return ; }
fs/btrfs/qgroup.c +15 -13
@@ -301,16 +301,16 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (btrfs_qgroup_status_version (l, ptr) !=BTRFS_QGROUP_STATUS_VERSION ) { -printk (KERN_ERR -"btrfs: old qgroup version, quota disabled\n" ); +btrfs_err (fs_info, +"old qgroup version, quota disabled" ); goto out; }if (btrfs_qgroup_status_generation (l, ptr) != fs_info->generation) { flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; -printk (KERN_ERR -"btrfs: qgroup generation mismatch, " -"marked as inconsistent\n" ); +btrfs_err (fs_info, +"qgroup generation mismatch, " +"marked as inconsistent" ); } fs_info->qgroup_flags =btrfs_qgroup_status_flags (l, ptr);
@@ -325,7 +325,7 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info) qgroup =find_qgroup_rb (fs_info, found_key.offset);if ((qgroup && found_key.type ==BTRFS_QGROUP_INFO_KEY ) || (!qgroup && found_key.type ==BTRFS_QGROUP_LIMIT_KEY )) { -printk (KERN_ERR "btrfs: inconsitent qgroup config\n" ); +btrfs_err (fs_info,"inconsitent qgroup config" ); flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; }if (!qgroup) {
@@ -396,8 +396,8 @@ next1: ret =add_relation_rb (fs_info, found_key.objectid, found_key.offset);if (ret == -ENOENT ) { -printk (KERN_WARNING -"btrfs: orphan qgroup relation 0x%llx->0x%llx\n" , +btrfs_warn (fs_info, +"orphan qgroup relation 0x%llx->0x%llx" , found_key.objectid, found_key.offset); ret =0 ;/* ignore the error */ }
@@ -1159,7 +1159,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, limit->rsv_excl);if (ret) { fs_info->qgroup_flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; -printk (KERN_INFO "unable to update quota limit for %llu\n" , +btrfs_info (fs_info,"unable to update quota limit for %llu" , qgroupid); }
@@ -1833,7 +1833,9 @@ void assert_qgroups_uptodate(struct btrfs_trans_handle *trans) {if (list_empty (&trans->qgroup_ref_list) && !trans->delayed_ref_elem.seq)return ; -pr_err ("btrfs: qgroups not uptodate in trans handle %p: list is%s empty, seq is %#x.%x\n" , +btrfs_err (trans->root->fs_info, +"qgroups not uptodate in trans handle %p: list is%s empty, " +"seq is %#x.%x" , trans,list_empty (&trans->qgroup_ref_list) ?"" :" not" , (u32)(trans->delayed_ref_elem.seq >>32 ), (u32 )trans->delayed_ref_elem.seq);
@@ -2030,10 +2032,10 @@ out:mutex_unlock (&fs_info->qgroup_rescan_lock);if (err >=0 ) { -pr_info ("btrfs: qgroup scan completed%s\n" , +btrfs_info (fs_info,"qgroup scan completed%s" , err ==2 ?" (inconsistency flag cleared)" :"" ); }else { -pr_err ("btrfs: qgroup scan failed with %d\n" , err); +btrfs_err (fs_info,"qgroup scan failed with %d" , err); }complete_all (&fs_info->qgroup_rescan_completion);
@@ -2089,7 +2091,7 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,if (ret) { err: -pr_info ("btrfs: qgroup_rescan_init failed with %d\n" , ret); +btrfs_info (fs_info,"qgroup_rescan_init failed with %d" , ret);return ret; }
fs/btrfs/reada.c +5 -4
@@ -189,8 +189,8 @@ static int __readahead_hook(struct btrfs_root *root, struct extent_buffer *eb,*/ #ifdef DEBUG if (rec->generation != generation) { -printk (KERN_DEBUG "generation mismatch for " -"(%llu,%d,%llu) %llu != %llu\n" , +btrfs_debug (root->fs_info, +"generation mismatch for (%llu,%d,%llu) %llu != %llu" , key.objectid, key.type, key.offset, rec->generation, generation); }
@@ -365,8 +365,9 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, goto error;if (bbio->num_stripes >BTRFS_MAX_MIRRORS ) { -printk (KERN_ERR "btrfs readahead: more than %d copies not " -"supported" ,BTRFS_MAX_MIRRORS ); +btrfs_err (root->fs_info, +"readahead: more than %d copies not supported" , +BTRFS_MAX_MIRRORS ); goto error; }
fs/btrfs/relocation.c +2 -2
@@ -4245,7 +4245,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start) goto out; } -printk (KERN_INFO "btrfs: relocating block group %llu flags %llu\n" , +btrfs_info (extent_root->fs_info,"relocating block group %llu flags %llu" , rc->block_group->key.objectid, rc->block_group->flags); ret =btrfs_start_delalloc_roots (fs_info,0 );
@@ -4267,7 +4267,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start)if (rc->extents_found ==0 )break ; -printk (KERN_INFO "btrfs: found %llu extents\n" , +btrfs_info (extent_root->fs_info,"found %llu extents" , rc->extents_found);if (rc->stage ==MOVE_DATA_EXTENTS && rc->found_file_extent) {
fs/btrfs/root-tree.c +2 -2
@@ -44,7 +44,7 @@ static void btrfs_read_root_item(struct extent_buffer *eb, int slot,if (!need_reset &&btrfs_root_generation (item) !=btrfs_root_generation_v2 (item)) {if (btrfs_root_generation_v2 (item) !=0 ) { -printk (KERN_WARNING "btrfs: mismatching " +printk (KERN_WARNING "BTRFS: mismatching " "generation and generation_v2 " "found in root item. This root " "was probably mounted with an "
@@ -154,7 +154,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_rootif (ret !=0 ) {btrfs_print_leaf (root, path->nodes[0 ]); -printk (KERN_CRIT "unable to update root key %llu %u %llu\n" , +btrfs_crit (root->fs_info,"unable to update root key %llu %u %llu" , key->objectid, key->type, key->offset);BUG_ON (1 ); }
fs/btrfs/scrub.c +27 -23
146 lines not on this page · raw message
fs/btrfs/send.c +2 -2
@@ -1278,7 +1278,7 @@ static int find_extent_clone(struct send_ctx *sctx,if (!backref_ctx->found_itself) {/* found a bug in backref code? */ ret = -EIO ; -printk (KERN_ERR "btrfs: ERROR did not find backref in " +btrfs_err (sctx->send_root->fs_info,"did not find backref in " "send_root. inode=%llu, offset=%llu, " "disk_byte=%llu found extent=%llu\n" , ino, data_offset, disk_byte, found_key.objectid);
@@ -4706,7 +4706,7 @@ join_trans:spin_unlock (&send_root->root_item_lock);if (ctransid != start_ctransid) { -WARN (1 ,KERN_WARNING "btrfs: the root that you're trying to " +WARN (1 ,KERN_WARNING "BTRFS: the root that you're trying to " "send was modified in between. This is " "probably a bug.\n" ); ret = -EIO ;
fs/btrfs/super.c +49 -55
318 lines not on this page · raw message
fs/btrfs/sysfs.c +1 -1
@@ -374,7 +374,7 @@ static ssize_t btrfs_label_store(struct kobject *kobj,int ret;if (len >=BTRFS_LABEL_SIZE ) { -pr_err ("btrfs: unable to set label with more than %d bytes\n" , +pr_err ("BTRFS: unable to set label with more than %d bytes\n" ,BTRFS_LABEL_SIZE -1 );return -EINVAL ; }
fs/btrfs/tests/extent-io-tests.c +3 -1
@@ -56,7 +56,9 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end,cond_resched (); loops++;if (loops >100000 ) { -printk (KERN_ERR "stuck in a loop, start %Lu, end %Lu, nr_pages %lu, ret %d\n" , start, end, nr_pages, ret); +btrfs_err (BTRFS_I (inode)->root->fs_info, +"stuck in a loop, start %Lu, end %Lu, nr_pages %lu, ret %d" , + start, end, nr_pages, ret);break ; } }
fs/btrfs/transaction.c +4 -4
@@ -198,10 +198,10 @@ loop:*/ smp_mb ();if (!list_empty (&fs_info->tree_mod_seq_list)) -WARN (1 ,KERN_ERR "btrfs: tree_mod_seq_list not empty when " +WARN (1 ,KERN_ERR "BTRFS: tree_mod_seq_list not empty when " "creating a fresh transaction\n" );if (!RB_EMPTY_ROOT (&fs_info->tree_mod_log)) -WARN (1 ,KERN_ERR "btrfs: tree_mod_log rb tree not empty when " +WARN (1 ,KERN_ERR "BTRFS: tree_mod_log rb tree not empty when " "creating a fresh transaction\n" );atomic64_set (&fs_info->tree_mod_seq,0 );
@@ -1107,7 +1107,7 @@ int btrfs_defrag_root(struct btrfs_root *root)break ;if (btrfs_defrag_cancelled (root->fs_info)) { -printk (KERN_DEBUG "btrfs: defrag_root cancelled\n" ); +pr_debug ("BTRFS: defrag_root cancelled\n" ); ret = -EAGAIN ;break ; }
@@ -1981,7 +1981,7 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root)list_del_init (&root->root_list);spin_unlock (&fs_info->trans_lock); -pr_debug ("btrfs: cleaner removing %llu\n" , root->objectid); +pr_debug ("BTRFS: cleaner removing %llu\n" , root->objectid);btrfs_kill_all_delayed_nodes (root);
fs/btrfs/uuid-tree.c +7 -6
@@ -69,7 +69,7 @@ static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, u8 *uuid, ret = -ENOENT ;if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (uuid_root->fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); goto out; }
@@ -137,7 +137,8 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, offset =btrfs_item_ptr_offset (eb, slot); offset +=btrfs_item_size_nr (eb, slot) -sizeof (subid_le); }else if (ret <0 ) { -pr_warn ("btrfs: insert uuid item failed %d (0x%016llx, 0x%016llx) type %u!\n" , +btrfs_warn (uuid_root->fs_info,"insert uuid item failed %d " +"(0x%016llx, 0x%016llx) type %u!" , ret, (unsigned long long )key.objectid, (unsigned long long )key.offset, type); goto out;
@@ -183,7 +184,7 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans, ret =btrfs_search_slot (trans, uuid_root, &key, path,-1 ,1 );if (ret <0 ) { -pr_warn ("btrfs: error %d while searching for uuid item!\n" , +btrfs_warn (uuid_root->fs_info,"error %d while searching for uuid item!" , ret); goto out; }
@@ -197,7 +198,7 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans, offset =btrfs_item_ptr_offset (eb, slot); item_size =btrfs_item_size_nr (eb, slot);if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (uuid_root->fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); ret = -ENOENT ; goto out;
@@ -299,7 +300,7 @@ again_search_slot: offset =btrfs_item_ptr_offset (leaf, slot); item_size =btrfs_item_size_nr (leaf, slot);if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); goto skip; }
@@ -349,6 +350,6 @@ skip: out:btrfs_free_path (path);if (ret) -pr_warn ("btrfs: btrfs_uuid_tree_iterate failed %d\n" , ret); +btrfs_warn (fs_info,"btrfs_uuid_tree_iterate failed %d" , ret);return 0 ; }
fs/btrfs/volumes.c +44 -45
270 lines not on this page · raw message
fs/btrfs/zlib.c +4 -4
@@ -97,7 +97,7 @@ static int zlib_compress_pages(struct list_head *ws, *total_in =0 ;if (Z_OK !=zlib_deflateInit (&workspace->def_strm,3 )) { -printk (KERN_WARNING "btrfs: deflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: deflateInit failed\n" ); ret =-1 ; goto out; }
@@ -125,7 +125,7 @@ static int zlib_compress_pages(struct list_head *ws,while (workspace->def_strm.total_in < len) { ret =zlib_deflate (&workspace->def_strm,Z_SYNC_FLUSH );if (ret !=Z_OK ) { -printk (KERN_DEBUG "btrfs: deflate in loop returned %d\n" , +printk (KERN_DEBUG "BTRFS: deflate in loop returned %d\n" , ret);zlib_deflateEnd (&workspace->def_strm); ret =-1 ;
@@ -252,7 +252,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in, }if (Z_OK !=zlib_inflateInit2 (&workspace->inf_strm, wbits)) { -printk (KERN_WARNING "btrfs: inflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: inflateInit failed\n" );return -1 ; }while (workspace->inf_strm.total_in < srclen) {
@@ -336,7 +336,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in, }if (Z_OK !=zlib_inflateInit2 (&workspace->inf_strm, wbits)) { -printk (KERN_WARNING "btrfs: inflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: inflateInit failed\n" );return -1 ; }
Signature · 1 line
1.7.9.5
Still failing to build
fs/btrfs/tests/extent-io-tests.c: In function ‘process_page_range’:fs/btrfs/tests/extent-io-tests.c:59:4: error: implicit declaration of function ‘btrfs_err’ [-Werror=implicit-function-declaration] btrfs_err(BTRFS_I(inode)->root->fs_info,
^fs/btrfs/tests/extent-io-tests.c:59:4: error: implicit declaration of function ‘BTRFS_I’ [-Werror=implicit-function-declaration] fs/btrfs/tests/extent-io-tests.c:59:28: error: invalid type argument of ‘->’ (have ‘int’) btrfs_err(BTRFS_I(inode)->root->fs_info,
^
Make sure you have the sanity tests config option enabled so you can make sure everything is getting built. Thanks,
Josef
PATCH v6 1/1 Btrfs: convert printk to btrfs_ and fix BTRFS prefix
In reply to Frank HoltonConvert all applicable cases of printk and pr_* to the btrfs_* macros.
Fix all uses of the BTRFS prefix.
---
v6 - fix compile errors with all .config options enabled, rebase to master v5 - fix trailing spaces
v4 - rebase to master btrfs-next, compile and run tested
v3 - cleanup problems noted by David, convert prefix to BTRFS v2 - changed pr_ and printk to btrfs_ output macro
fs/btrfs/compression.c | 12 ++--- fs/btrfs/ctree.c | 16 +++---- fs/btrfs/ctree.h | 4 +- fs/btrfs/delayed-inode.c | 8 ++-- fs/btrfs/dev-replace.c | 56 ++++++++++++---------- fs/btrfs/dir-item.c | 6 +-- fs/btrfs/disk-io.c | 106 +++++++++++++++++++++--------------------- fs/btrfs/extent-tree.c | 14 +++--- fs/btrfs/extent_io.c | 61 ++++++++++++++---------- fs/btrfs/file-item.c | 4 +- fs/btrfs/free-space-cache.c | 21 +++++---- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 30 ++++++------ fs/btrfs/lzo.c | 6 +-- fs/btrfs/ordered-data.c | 12 +++-- fs/btrfs/print-tree.c | 2 +- fs/btrfs/qgroup.c | 28 +++++------ fs/btrfs/reada.c | 9 ++-- fs/btrfs/relocation.c | 4 +- fs/btrfs/root-tree.c | 4 +- fs/btrfs/scrub.c | 50 +++++++++++--------- fs/btrfs/send.c | 4 +- fs/btrfs/super.c | 104 +++++++++++++++++++---------------------- fs/btrfs/sysfs.c | 2 +- fs/btrfs/tests/btrfs-tests.h | 2 +- fs/btrfs/transaction.c | 8 ++-- fs/btrfs/uuid-tree.c | 13 +++--- fs/btrfs/volumes.c | 89 ++++++++++++++++++----------------- fs/btrfs/zlib.c | 8 ++-- 29 files changed, 358 insertions(+), 329 deletions(-)
fs/btrfs/compression.c +6 -6
@@ -128,11 +128,10 @@ static int check_compressed_csum(struct inode *inode,kunmap_atomic (kaddr);if (csum != *cb_sum) { -printk (KERN_INFO "btrfs csum failed ino %llu " -"extent %llu csum %u " -"wanted %u mirror %d\n" , -btrfs_ino (inode), disk_start, csum, *cb_sum, - cb->mirror_num); +btrfs_info (BTRFS_I (inode)->root->fs_info, +"csum failed ino %llu extent %llu csum %u wanted %u mirror %d" , +btrfs_ino (inode), disk_start, csum, *cb_sum, + cb->mirror_num); ret = -EIO ; goto fail; }
@@ -412,7 +411,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,bio_add_page (bio, page,PAGE_CACHE_SIZE ,0 ); }if (bytes_left <PAGE_CACHE_SIZE ) { -printk ("bytes left %lu compress len %lu nr %lu\n" , +btrfs_info (BTRFS_I (inode)->root->fs_info, +"bytes left %lu compress len %lu nr %lu" , bytes_left, cb->compressed_len, cb->nr_pages); } bytes_left -=PAGE_CACHE_SIZE ;
fs/btrfs/ctree.c +8 -8
@@ -1480,8 +1480,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq) old =read_tree_block (root, logical, blocksize,0 );if (WARN_ON (!old || !extent_buffer_uptodate (old))) {free_extent_buffer (old); -pr_warn ("btrfs: failed to read tree block %llu from get_old_root\n" , - logical); +btrfs_warn (root->fs_info, +"failed to read tree block %llu from get_old_root" , logical); }else { eb =btrfs_clone_extent_buffer (old);free_extent_buffer (old);
@@ -3615,8 +3615,8 @@ noinline int btrfs_leaf_free_space(struct btrfs_root *root,int ret; ret =BTRFS_LEAF_DATA_SIZE (root) -leaf_space_used (leaf,0 , nritems);if (ret <0 ) { -printk (KERN_CRIT "leaf free space ret %d, leaf data size %lu, " -"used %d nritems %d\n" , +btrfs_crit (root->fs_info, +"leaf free space ret %d, leaf data size %lu, used %d nritems %d" , ret, (unsigned long )BTRFS_LEAF_DATA_SIZE (root),leaf_space_used (leaf,0 , nritems), nritems); }
@@ -4706,7 +4706,7 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,BUG_ON (slot <0 );if (slot >= nritems) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "slot %d too large, nritems %d\n" , +btrfs_crit (root->fs_info,"slot %d too large, nritems %d" , slot, nritems);BUG_ON (1 ); }
@@ -4769,7 +4769,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,if (btrfs_leaf_free_space (root, leaf) < total_size) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "not enough freespace need %u have %d\n" , +btrfs_crit (root->fs_info,"not enough freespace need %u have %d" , total_size,btrfs_leaf_free_space (root, leaf));BUG (); }
@@ -4779,7 +4779,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,if (old_data < data_end) {btrfs_print_leaf (root, leaf); -printk (KERN_CRIT "slot %d old_data %d data_end %d\n" , +btrfs_crit (root->fs_info,"slot %d old_data %d data_end %d" , slot, old_data, data_end);BUG_ON (1 ); }
@@ -5514,7 +5514,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,if (!left_start_ctransid || !right_start_ctransid) {WARN (1 ,KERN_WARNING -"btrfs: btrfs_compare_tree detected " +"BTRFS: btrfs_compare_tree detected " "a change in one of the trees while " "iterating. This is probably a " "bug.\n" );
fs/btrfs/ctree.h +2 -2
@@ -3877,7 +3877,7 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)static inline void assfail (char *expr,char *file,int line) { -printk (KERN_ERR "BTRFS assertion failed: %s, file: %s, line: %d" , +pr_err ("BTRFS: assertion failed: %s, file: %s, line: %d" , expr, file, line);BUG (); }
@@ -3915,7 +3915,7 @@ static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info,if (!(features & flag)) { features |= flag;btrfs_set_super_incompat_flags (disk_super, features); -printk (KERN_INFO "btrfs: setting %llu feature flag\n" , +btrfs_info (fs_info,"setting %llu feature flag" , flag); }spin_unlock (&fs_info->super_lock);
fs/btrfs/delayed-inode.c +4 -4
@@ -1435,9 +1435,9 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,mutex_lock (&delayed_node->mutex); ret =__btrfs_add_delayed_insertion_item (delayed_node, delayed_item);if (unlikely (ret)) { -printk (KERN_ERR "err add delayed dir index item(name: %.*s) " +btrfs_err (root->fs_info,"err add delayed dir index item(name: %.*s) " "into the insertion tree of the delayed node" -"(root id: %llu, inode id: %llu, errno: %d)\n" , +"(root id: %llu, inode id: %llu, errno: %d)" , name_len, name, delayed_node->root->objectid, delayed_node->inode_id, ret);BUG ();
@@ -1507,9 +1507,9 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,mutex_lock (&node->mutex); ret =__btrfs_add_delayed_deletion_item (node, item);if (unlikely (ret)) { -printk (KERN_ERR "err add delayed dir index item(index: %llu) " +btrfs_err (root->fs_info,"err add delayed dir index item(index: %llu) " "into the deletion tree of the delayed node" -"(root id: %llu, inode id: %llu, errno: %d)\n" , +"(root id: %llu, inode id: %llu, errno: %d)" , index, node->root->objectid, node->inode_id, ret);BUG ();
fs/btrfs/dev-replace.c +32 -24
144 lines not on this page · raw message
fs/btrfs/dir-item.c +3 -3
@@ -459,7 +459,7 @@ int verify_dir_item(struct btrfs_root *root,u8 type =btrfs_dir_type (leaf, dir_item);if (type >=BTRFS_FT_MAX ) { -printk (KERN_CRIT "btrfs: invalid dir item type: %d\n" , +btrfs_crit (root->fs_info,"invalid dir item type: %d" , (int )type);return 1 ; }
@@ -468,7 +468,7 @@ int verify_dir_item(struct btrfs_root *root, namelen =XATTR_NAME_MAX ;if (btrfs_dir_name_len (leaf, dir_item) > namelen) { -printk (KERN_CRIT "btrfs: invalid dir item name len: %u\n" , +btrfs_crit (root->fs_info,"invalid dir item name len: %u" , (unsigned )btrfs_dir_data_len (leaf, dir_item));return 1 ; }
@@ -476,7 +476,7 @@ int verify_dir_item(struct btrfs_root *root,/* BTRFS_MAX_XATTR_SIZE is the same for all dir items */ if ((btrfs_dir_data_len (leaf, dir_item) +btrfs_dir_name_len (leaf, dir_item)) >BTRFS_MAX_XATTR_SIZE (root)) { -printk (KERN_CRIT "btrfs: invalid dir item name + data len: %u + %u\n" , +btrfs_crit (root->fs_info,"invalid dir item name + data len: %u + %u" , (unsigned )btrfs_dir_name_len (leaf, dir_item), (unsigned )btrfs_dir_data_len (leaf, dir_item));return 1 ;
fs/btrfs/disk-io.c +54 -52
362 lines not on this page · raw message
fs/btrfs/extent-tree.c +8 -6
@@ -7049,12 +7049,12 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes,int index =0 ;spin_lock (&info->lock); -printk (KERN_INFO "space_info %llu has %llu free, is %sfull\n" , +printk (KERN_INFO "BTRFS: space_info %llu has %llu free, is %sfull\n" , info->flags, info->total_bytes - info->bytes_used - info->bytes_pinned - info->bytes_reserved - info->bytes_readonly, (info->full) ?"" :"not " ); - printk(KERN_INFO "space_info total=%llu, used=%llu, pinned=%llu, " + printk(KERN_INFO "BTRFS: space_info total=%llu, used=%llu, pinned=%llu, " "reserved=%llu, may_use=%llu, readonly=%llu\n", info->total_bytes, info->bytes_used, info->bytes_pinned, info->bytes_reserved, info->bytes_may_use,
@@ -7068,7 +7068,9 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes, again:list_for_each_entry (cache, &info->block_groups[index], list) {spin_lock (&cache->lock); -printk (KERN_INFO "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %s\n" , +printk (KERN_INFO "BTRFS: " +"block group %llu has %llu bytes, " +"%llu used %llu pinned %llu reserved %s\n" , cache->key.objectid, cache->key.offset,btrfs_block_group_used (&cache->item), cache->pinned, cache->reserved, cache->ro ?"[readonly]" :"" );
@@ -7446,7 +7448,7 @@ again: /*DEFAULT_RATELIMIT_BURST*/ 1);if (__ratelimit (&_rs))WARN (1 ,KERN_DEBUG -"btrfs: block rsv returned %d\n" , ret); +"BTRFS: block rsv returned %d\n" , ret); } try_reserve: ret = reserve_metadata_bytes(root, block_rsv, blocksize,
@@ -8203,7 +8205,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,btrfs_end_transaction_throttle (trans, tree_root);if (!for_reloc &&btrfs_need_cleaner_sleep (root)) { -pr_debug ("btrfs: drop snapshot early exit\n" ); +pr_debug ("BTRFS: drop snapshot early exit\n" ); err = -EAGAIN ; goto out_free; }
@@ -8863,7 +8865,7 @@ static void __link_block_group(struct btrfs_space_info *space_info, ret =kobject_add (kobj, &space_info->kobj,"%s" ,get_raid_name (index));if (ret) { -pr_warn ("btrfs: failed to add kobject for block cache. ignoring.\n" ); +pr_warn ("BTRFS: failed to add kobject for block cache. ignoring.\n" );kobject_put (&space_info->kobj); } }
fs/btrfs/extent_io.c +37 -24
135 lines not on this page · raw message
fs/btrfs/file-item.c +2 -2
@@ -246,8 +246,8 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, offset + bvec->bv_len -1 , EXTENT_NODATASUM, GFP_NOFS); }else { -printk (KERN_INFO "btrfs no csum found " -"for inode %llu start %llu\n" , +btrfs_info (BTRFS_I (inode)->root->fs_info, +"no csum found for inode %llu start %llu" ,btrfs_ino (inode), offset); } item =NULL ;
fs/btrfs/free-space-cache.c +11 -10
@@ -347,8 +347,8 @@ static int io_ctl_prepare_pages(struct io_ctl *io_ctl, struct inode *inode,btrfs_readpage (NULL , page);lock_page (page);if (!PageUptodate (page)) { -printk (KERN_ERR "btrfs: error reading free " -"space cache\n" ); +btrfs_err (BTRFS_I (inode)->root->fs_info, +"error reading free space cache" );io_ctl_drop_pages (io_ctl);return -EIO ; }
@@ -405,7 +405,7 @@ static int io_ctl_check_generation(struct io_ctl *io_ctl, u64 generation) gen = io_ctl->cur;if (le64_to_cpu (*gen) != generation) { -printk_ratelimited (KERN_ERR "btrfs: space cache generation " +printk_ratelimited (KERN_ERR "BTRFS: space cache generation " "(%Lu) does not match inode (%Lu)\n" , *gen, generation);io_ctl_unmap_page (io_ctl);
@@ -463,7 +463,7 @@ static int io_ctl_check_crc(struct io_ctl *io_ctl, int index) PAGE_CACHE_SIZE - offset);btrfs_csum_final (crc, (char *)&crc);if (val != crc) { -printk_ratelimited (KERN_ERR "btrfs: csum mismatch on free " +printk_ratelimited (KERN_ERR "BTRFS: csum mismatch on free " "space cache\n" );io_ctl_unmap_page (io_ctl);return -EIO ;
@@ -1902,7 +1902,7 @@ out:spin_unlock (&ctl->tree_lock);if (ret) { -printk (KERN_CRIT "btrfs: unable to add free space :%d\n" , ret); +printk (KERN_CRIT "BTRFS: unable to add free space :%d\n" , ret);ASSERT (ret != -EEXIST ); }
@@ -2011,14 +2011,15 @@ void btrfs_dump_free_space(struct btrfs_block_group_cache *block_group, info = rb_entry(n, struct btrfs_free_space, offset_index);if (info->bytes >= bytes && !block_group->ro) count++; -printk (KERN_CRIT "entry offset %llu, bytes %llu, bitmap %s\n" , - info->offset, info->bytes, +btrfs_crit (block_group->fs_info, +"entry offset %llu, bytes %llu, bitmap %s" , + info->offset, info->bytes, (info->bitmap) ?"yes" :"no" ); } -printk (KERN_INFO "block group has cluster?: %s\n" , +btrfs_info (block_group->fs_info,"block group has cluster?: %s" ,list_empty (&block_group->cluster_list) ?"no" :"yes" ); -printk (KERN_INFO "%d blocks of free space at or bigger than bytes is" -"\n" , count); +btrfs_info (block_group->fs_info, +"%d blocks of free space at or bigger than bytes is" , count); }void btrfs_init_free_space_ctl (struct btrfs_block_group_cache *block_group)
fs/btrfs/inode.c +2 -2
@@ -6966,8 +6966,8 @@ static void btrfs_end_dio_bio(struct bio *bio, int err)struct btrfs_dio_private *dip = bio->bi_private;if (err) { -printk (KERN_ERR "btrfs direct IO failed ino %llu rw %lu " -"sector %#Lx len %u err no %d\n" , +btrfs_err (BTRFS_I (dip->inode)->root->fs_info, +"direct IO failed ino %llu rw %lu sector %#Lx len %u err no %d" ,btrfs_ino (dip->inode), bio->bi_rw, (unsigned long long )bio->bi_sector, bio->bi_size, err); dip->errors =1 ;
fs/btrfs/ioctl.c +15 -15
@@ -1262,7 +1262,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,break ;if (btrfs_defrag_cancelled (root->fs_info)) { -printk (KERN_DEBUG "btrfs: defrag_file cancelled\n" ); +printk (KERN_DEBUG "BTRFS: defrag_file cancelled\n" ); ret = -EAGAIN ;break ; }
@@ -1424,20 +1424,20 @@ static noinline int btrfs_ioctl_resize(struct file *file, ret = -EINVAL ; goto out_free; } -printk (KERN_INFO "btrfs: resizing devid %llu\n" , devid); +btrfs_info (root->fs_info,"resizing devid %llu" , devid); } device =btrfs_find_device (root->fs_info, devid,NULL ,NULL );if (!device) { -printk (KERN_INFO "btrfs: resizer unable to find device %llu\n" , +btrfs_info (root->fs_info,"resizer unable to find device %llu" , devid); ret = -ENODEV ; goto out_free; }if (!device->writeable) { -printk (KERN_INFO "btrfs: resizer unable to apply on " -"readonly device %llu\n" , +btrfs_info (root->fs_info, +"resizer unable to apply on readonly device %llu" , devid); ret = -EPERM ; goto out_free;
@@ -1489,7 +1489,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,do_div (new_size, root->sectorsize); new_size *= root->sectorsize; -printk_in_rcu (KERN_INFO "btrfs: new size for %s is %llu\n" , +printk_in_rcu (KERN_INFO "BTRFS: new size for %s is %llu\n" ,rcu_str_deref (device->name), new_size);if (new_size > old_size) {
@@ -1550,8 +1550,8 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file, src_inode =file_inode (src.file);if (src_inode->i_sb !=file_inode (file)->i_sb) { -printk (KERN_INFO "btrfs: Snapshot src from " -"another FS\n" ); +btrfs_info (BTRFS_I (src_inode)->root->fs_info, +"Snapshot src from another FS" ); ret = -EINVAL ; }else { ret = btrfs_mksubvol(&file->f_path, name, namelen,
@@ -1934,7 +1934,7 @@ static noinline int search_ioctl(struct inode *inode, key.offset = (u64)-1 ; root =btrfs_read_fs_root_no_name (info, &key);if (IS_ERR (root)) { -printk (KERN_ERR "could not find root %llu\n" , +printk (KERN_ERR "BTRFS: could not find root %llu\n" , sk->tree_id);btrfs_free_path (path);return -ENOENT ;
@@ -2024,7 +2024,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, key.offset = (u64)-1 ; root =btrfs_read_fs_root_no_name (info, &key);if (IS_ERR (root)) { -printk (KERN_ERR "could not find root %llu\n" , tree_id); +printk (KERN_ERR "BTRFS: could not find root %llu\n" , tree_id); ret = -ENOENT ; goto out; }
@@ -3367,8 +3367,8 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)if (IS_ERR_OR_NULL (di)) {btrfs_free_path (path);btrfs_end_transaction (trans, root); -printk (KERN_ERR "Umm, you don't have the default dir item, " -"this isn't going to work\n" ); +btrfs_err (new_root->fs_info,"Umm, you don't have the default dir" +"item, this isn't going to work" ); ret = -ENOENT ; goto out; }
@@ -4469,8 +4469,8 @@ static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg) len =strnlen (label,BTRFS_LABEL_SIZE );if (len ==BTRFS_LABEL_SIZE ) { -pr_warn ("btrfs: label is too long, return the first %zu bytes\n" , - --len); +btrfs_warn (root->fs_info, +"label is too long, return the first %zu bytes" , --len); } ret =copy_to_user (arg, label, len);
@@ -4493,7 +4493,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)return -EFAULT ;if (strnlen (label,BTRFS_LABEL_SIZE ) ==BTRFS_LABEL_SIZE ) { -pr_err ("btrfs: unable to set label with more than %d bytes\n" , +btrfs_err (root->fs_info,"unable to set label with more than %d bytes" ,BTRFS_LABEL_SIZE -1 );return -EINVAL ; }
fs/btrfs/lzo.c +3 -3
@@ -141,7 +141,7 @@ static int lzo_compress_pages(struct list_head *ws, ret =lzo1x_1_compress (data_in, in_len, workspace->cbuf, &out_len, workspace->mem);if (ret !=LZO_E_OK ) { -printk (KERN_DEBUG "btrfs deflate in loop returned %d\n" , +printk (KERN_DEBUG "BTRFS: deflate in loop returned %d\n" , ret); ret =-1 ; goto out;
@@ -357,7 +357,7 @@ cont:if (need_unmap)kunmap (pages_in[page_in_index -1 ]);if (ret !=LZO_E_OK ) { -printk (KERN_WARNING "btrfs decompress failed\n" ); +printk (KERN_WARNING "BTRFS: decompress failed\n" ); ret =-1 ;break ; }
@@ -401,7 +401,7 @@ static int lzo_decompress(struct list_head *ws, unsigned char *data_in, out_len =PAGE_CACHE_SIZE ; ret =lzo1x_decompress_safe (data_in, in_len, workspace->buf, &out_len);if (ret !=LZO_E_OK ) { -printk (KERN_WARNING "btrfs decompress failed!\n" ); +printk (KERN_WARNING "BTRFS: decompress failed!\n" ); ret =-1 ; goto out; }
fs/btrfs/ordered-data.c +7 -5
@@ -336,13 +336,14 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode, entry->len); *file_offset = dec_end;if (dec_start > dec_end) { -printk (KERN_CRIT "bad ordering dec_start %llu end %llu\n" , - dec_start, dec_end); +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordering dec_start %llu end %llu" , dec_start, dec_end); } to_dec = dec_end - dec_start;if (to_dec > entry->bytes_left) { -printk (KERN_CRIT "bad ordered accounting left %llu size %llu\n" , - entry->bytes_left, to_dec); +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordered accounting left %llu size %llu" , + entry->bytes_left, to_dec); } entry->bytes_left -= to_dec;if (!uptodate)
@@ -401,7 +402,8 @@ have_entry: }if (io_size > entry->bytes_left) { -printk (KERN_CRIT "bad ordered accounting left %llu size %llu\n" , +btrfs_crit (BTRFS_I (inode)->root->fs_info, +"bad ordered accounting left %llu size %llu" , entry->bytes_left, io_size); } entry->bytes_left -= io_size;
fs/btrfs/print-tree.c +1 -1
@@ -154,7 +154,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset, u32 item_size) {if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +pr_warn ("BTRFS: uuid item with illegal size %lu!\n" , (unsigned long )item_size);return ; }
fs/btrfs/qgroup.c +15 -13
@@ -333,16 +333,16 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)if (btrfs_qgroup_status_version (l, ptr) !=BTRFS_QGROUP_STATUS_VERSION ) { -printk (KERN_ERR -"btrfs: old qgroup version, quota disabled\n" ); +btrfs_err (fs_info, +"old qgroup version, quota disabled" ); goto out; }if (btrfs_qgroup_status_generation (l, ptr) != fs_info->generation) { flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; -printk (KERN_ERR -"btrfs: qgroup generation mismatch, " -"marked as inconsistent\n" ); +btrfs_err (fs_info, +"qgroup generation mismatch, " +"marked as inconsistent" ); } fs_info->qgroup_flags =btrfs_qgroup_status_flags (l, ptr);
@@ -357,7 +357,7 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info) qgroup =find_qgroup_rb (fs_info, found_key.offset);if ((qgroup && found_key.type ==BTRFS_QGROUP_INFO_KEY ) || (!qgroup && found_key.type ==BTRFS_QGROUP_LIMIT_KEY )) { -printk (KERN_ERR "btrfs: inconsitent qgroup config\n" ); +btrfs_err (fs_info,"inconsitent qgroup config" ); flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; }if (!qgroup) {
@@ -428,8 +428,8 @@ next1: ret =add_relation_rb (fs_info, found_key.objectid, found_key.offset);if (ret == -ENOENT ) { -printk (KERN_WARNING -"btrfs: orphan qgroup relation 0x%llx->0x%llx\n" , +btrfs_warn (fs_info, +"orphan qgroup relation 0x%llx->0x%llx" , found_key.objectid, found_key.offset); ret =0 ;/* ignore the error */ }
@@ -1199,7 +1199,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, limit->rsv_excl);if (ret) { fs_info->qgroup_flags |=BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ; -printk (KERN_INFO "unable to update quota limit for %llu\n" , +btrfs_info (fs_info,"unable to update quota limit for %llu" , qgroupid); }
@@ -2471,7 +2471,9 @@ void assert_qgroups_uptodate(struct btrfs_trans_handle *trans) {if (list_empty (&trans->qgroup_ref_list) && !trans->delayed_ref_elem.seq)return ; -pr_err ("btrfs: qgroups not uptodate in trans handle %p: list is%s empty, seq is %#x.%x\n" , +btrfs_err (trans->root->fs_info, +"qgroups not uptodate in trans handle %p: list is%s empty, " +"seq is %#x.%x" , trans,list_empty (&trans->qgroup_ref_list) ?"" :" not" , (u32)(trans->delayed_ref_elem.seq >>32 ), (u32 )trans->delayed_ref_elem.seq);
@@ -2660,10 +2662,10 @@ out:mutex_unlock (&fs_info->qgroup_rescan_lock);if (err >=0 ) { -pr_info ("btrfs: qgroup scan completed%s\n" , +btrfs_info (fs_info,"qgroup scan completed%s" , err ==2 ?" (inconsistency flag cleared)" :"" ); }else { -pr_err ("btrfs: qgroup scan failed with %d\n" , err); +btrfs_err (fs_info,"qgroup scan failed with %d" , err); }complete_all (&fs_info->qgroup_rescan_completion);
@@ -2719,7 +2721,7 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid,if (ret) { err: -pr_info ("btrfs: qgroup_rescan_init failed with %d\n" , ret); +btrfs_info (fs_info,"qgroup_rescan_init failed with %d" , ret);return ret; }
fs/btrfs/reada.c +5 -4
@@ -189,8 +189,8 @@ static int __readahead_hook(struct btrfs_root *root, struct extent_buffer *eb,*/ #ifdef DEBUG if (rec->generation != generation) { -printk (KERN_DEBUG "generation mismatch for " -"(%llu,%d,%llu) %llu != %llu\n" , +btrfs_debug (root->fs_info, +"generation mismatch for (%llu,%d,%llu) %llu != %llu" , key.objectid, key.type, key.offset, rec->generation, generation); }
@@ -365,8 +365,9 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, goto error;if (bbio->num_stripes >BTRFS_MAX_MIRRORS ) { -printk (KERN_ERR "btrfs readahead: more than %d copies not " -"supported" ,BTRFS_MAX_MIRRORS ); +btrfs_err (root->fs_info, +"readahead: more than %d copies not supported" , +BTRFS_MAX_MIRRORS ); goto error; }
fs/btrfs/relocation.c +2 -2
@@ -4245,7 +4245,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start) goto out; } -printk (KERN_INFO "btrfs: relocating block group %llu flags %llu\n" , +btrfs_info (extent_root->fs_info,"relocating block group %llu flags %llu" , rc->block_group->key.objectid, rc->block_group->flags); ret =btrfs_start_delalloc_roots (fs_info,0 );
@@ -4267,7 +4267,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start)if (rc->extents_found ==0 )break ; -printk (KERN_INFO "btrfs: found %llu extents\n" , +btrfs_info (extent_root->fs_info,"found %llu extents" , rc->extents_found);if (rc->stage ==MOVE_DATA_EXTENTS && rc->found_file_extent) {
fs/btrfs/root-tree.c +2 -2
@@ -44,7 +44,7 @@ static void btrfs_read_root_item(struct extent_buffer *eb, int slot,if (!need_reset &&btrfs_root_generation (item) !=btrfs_root_generation_v2 (item)) {if (btrfs_root_generation_v2 (item) !=0 ) { -printk (KERN_WARNING "btrfs: mismatching " +printk (KERN_WARNING "BTRFS: mismatching " "generation and generation_v2 " "found in root item. This root " "was probably mounted with an "
@@ -154,7 +154,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_rootif (ret !=0 ) {btrfs_print_leaf (root, path->nodes[0 ]); -printk (KERN_CRIT "unable to update root key %llu %u %llu\n" , +btrfs_crit (root->fs_info,"unable to update root key %llu %u %llu" , key->objectid, key->type, key->offset);BUG_ON (1 ); }
fs/btrfs/scrub.c +27 -23
146 lines not on this page · raw message
fs/btrfs/send.c +2 -2
@@ -1234,7 +1234,7 @@ static int find_extent_clone(struct send_ctx *sctx,if (!backref_ctx->found_itself) {/* found a bug in backref code? */ ret = -EIO ; -printk (KERN_ERR "btrfs: ERROR did not find backref in " +btrfs_err (sctx->send_root->fs_info,"did not find backref in " "send_root. inode=%llu, offset=%llu, " "disk_byte=%llu found extent=%llu\n" , ino, data_offset, disk_byte, found_key.objectid);
@@ -4648,7 +4648,7 @@ static int full_send_tree(struct send_ctx *sctx)spin_unlock (&send_root->root_item_lock);if (ctransid != start_ctransid) { -WARN (1 ,KERN_WARNING "btrfs: the root that you're trying to " +WARN (1 ,KERN_WARNING "BTRFS: the root that you're trying to " "send was modified in between. This is " "probably a bug.\n" ); ret = -EIO ;
fs/btrfs/super.c +49 -55
318 lines not on this page · raw message
fs/btrfs/sysfs.c +1 -1
@@ -374,7 +374,7 @@ static ssize_t btrfs_label_store(struct kobject *kobj,int ret;if (len >=BTRFS_LABEL_SIZE ) { -pr_err ("btrfs: unable to set label with more than %d bytes\n" , +pr_err ("BTRFS: unable to set label with more than %d bytes\n" ,BTRFS_LABEL_SIZE -1 );return -EINVAL ; }
fs/btrfs/tests/btrfs-tests.h +1 -1
@@ -21,7 +21,7 @@#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS -#define test_msg (fmt, ...) pr_info("btrfs: selftest: " fmt, ##__VA_ARGS__) +#define test_msg (fmt, ...) pr_info("BTRFS: selftest: " fmt, ##__VA_ARGS__)struct btrfs_root ;
fs/btrfs/transaction.c +4 -4
@@ -198,10 +198,10 @@ loop:*/ smp_mb ();if (!list_empty (&fs_info->tree_mod_seq_list)) -WARN (1 ,KERN_ERR "btrfs: tree_mod_seq_list not empty when " +WARN (1 ,KERN_ERR "BTRFS: tree_mod_seq_list not empty when " "creating a fresh transaction\n" );if (!RB_EMPTY_ROOT (&fs_info->tree_mod_log)) -WARN (1 ,KERN_ERR "btrfs: tree_mod_log rb tree not empty when " +WARN (1 ,KERN_ERR "BTRFS: tree_mod_log rb tree not empty when " "creating a fresh transaction\n" );atomic64_set (&fs_info->tree_mod_seq,0 );
@@ -1096,7 +1096,7 @@ int btrfs_defrag_root(struct btrfs_root *root)break ;if (btrfs_defrag_cancelled (root->fs_info)) { -printk (KERN_DEBUG "btrfs: defrag_root cancelled\n" ); +pr_debug ("BTRFS: defrag_root cancelled\n" ); ret = -EAGAIN ;break ; }
@@ -1974,7 +1974,7 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root)list_del_init (&root->root_list);spin_unlock (&fs_info->trans_lock); -pr_debug ("btrfs: cleaner removing %llu\n" , root->objectid); +pr_debug ("BTRFS: cleaner removing %llu\n" , root->objectid);btrfs_kill_all_delayed_nodes (root);
fs/btrfs/uuid-tree.c +7 -6
@@ -69,7 +69,7 @@ static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, u8 *uuid, ret = -ENOENT ;if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (uuid_root->fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); goto out; }
@@ -137,7 +137,8 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, offset =btrfs_item_ptr_offset (eb, slot); offset +=btrfs_item_size_nr (eb, slot) -sizeof (subid_le); }else if (ret <0 ) { -pr_warn ("btrfs: insert uuid item failed %d (0x%016llx, 0x%016llx) type %u!\n" , +btrfs_warn (uuid_root->fs_info,"insert uuid item failed %d " +"(0x%016llx, 0x%016llx) type %u!" , ret, (unsigned long long )key.objectid, (unsigned long long )key.offset, type); goto out;
@@ -183,7 +184,7 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans, ret =btrfs_search_slot (trans, uuid_root, &key, path,-1 ,1 );if (ret <0 ) { -pr_warn ("btrfs: error %d while searching for uuid item!\n" , +btrfs_warn (uuid_root->fs_info,"error %d while searching for uuid item!" , ret); goto out; }
@@ -197,7 +198,7 @@ int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans, offset =btrfs_item_ptr_offset (eb, slot); item_size =btrfs_item_size_nr (eb, slot);if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (uuid_root->fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); ret = -ENOENT ; goto out;
@@ -299,7 +300,7 @@ again_search_slot: offset =btrfs_item_ptr_offset (leaf, slot); item_size =btrfs_item_size_nr (leaf, slot);if (!IS_ALIGNED (item_size,sizeof (u64))) { -pr_warn ("btrfs: uuid item with illegal size %lu!\n" , +btrfs_warn (fs_info,"uuid item with illegal size %lu!" , (unsigned long )item_size); goto skip; }
@@ -349,6 +350,6 @@ skip: out:btrfs_free_path (path);if (ret) -pr_warn ("btrfs: btrfs_uuid_tree_iterate failed %d\n" , ret); +btrfs_warn (fs_info,"btrfs_uuid_tree_iterate failed %d" , ret);return 0 ; }
fs/btrfs/volumes.c +44 -45
270 lines not on this page · raw message
fs/btrfs/zlib.c +4 -4
@@ -97,7 +97,7 @@ static int zlib_compress_pages(struct list_head *ws, *total_in =0 ;if (Z_OK !=zlib_deflateInit (&workspace->def_strm,3 )) { -printk (KERN_WARNING "btrfs: deflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: deflateInit failed\n" ); ret =-1 ; goto out; }
@@ -125,7 +125,7 @@ static int zlib_compress_pages(struct list_head *ws,while (workspace->def_strm.total_in < len) { ret =zlib_deflate (&workspace->def_strm,Z_SYNC_FLUSH );if (ret !=Z_OK ) { -printk (KERN_DEBUG "btrfs: deflate in loop returned %d\n" , +printk (KERN_DEBUG "BTRFS: deflate in loop returned %d\n" , ret);zlib_deflateEnd (&workspace->def_strm); ret =-1 ;
@@ -252,7 +252,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in, }if (Z_OK !=zlib_inflateInit2 (&workspace->inf_strm, wbits)) { -printk (KERN_WARNING "btrfs: inflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: inflateInit failed\n" );return -1 ; }while (workspace->inf_strm.total_in < srclen) {
@@ -336,7 +336,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in, }if (Z_OK !=zlib_inflateInit2 (&workspace->inf_strm, wbits)) { -printk (KERN_WARNING "btrfs: inflateInit failed\n" ); +printk (KERN_WARNING "BTRFS: inflateInit failed\n" );return -1 ; }
Signature · 1 line
1.7.9.5