Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1c9ff7c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Chris Mason
Browse files

Btrfs: Remove superfluous casts from u64 to unsigned long long 



u64 is "unsigned long long" on all architectures now, so there's no need to
cast it when formatting it using the "ll" length modifier.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 1cb048f5

fs/btrfs/backref.c

+9 −15
Original line number Original line Diff line number Diff line
@@ -295,10 +295,9 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, 
	ret = btrfs_search_old_slot(root, &ref->key_for_search, path, time_seq);

	ret = btrfs_search_old_slot(root, &ref->key_for_search, path, time_seq);

	pr_debug("search slot in root %llu (level %d, ref count %d) returned "

	pr_debug("search slot in root %llu (level %d, ref count %d) returned "

		 "%d for key (%llu %u %llu)\n",

		 "%d for key (%llu %u %llu)\n",

		 (unsigned long long)ref->root_id, level, ref->count, ret,

		 ref->root_id, level, ref->count, ret,

		 (unsigned long long)ref->key_for_search.objectid,

		 ref->key_for_search.objectid, ref->key_for_search.type,

		 ref->key_for_search.type,

		 ref->key_for_search.offset);

		 (unsigned long long)ref->key_for_search.offset);

	if (ret < 0)

	if (ret < 0)

		goto out;

		goto out;
@@ -1328,8 +1327,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
	     found_key->type != BTRFS_METADATA_ITEM_KEY) ||

	     found_key->type != BTRFS_METADATA_ITEM_KEY) ||

	    found_key->objectid > logical ||

	    found_key->objectid > logical ||

	    found_key->objectid + size <= logical) {

	    found_key->objectid + size <= logical) {

		pr_debug("logical %llu is not within any extent\n",

		pr_debug("logical %llu is not within any extent\n", logical);

			 (unsigned long long)logical);

		return -ENOENT;

		return -ENOENT;

	}

	}
@@ -1342,11 +1340,8 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 




	pr_debug("logical %llu is at position %llu within the extent (%llu "

	pr_debug("logical %llu is at position %llu within the extent (%llu "

		 "EXTENT_ITEM %llu) flags %#llx size %u\n",

		 "EXTENT_ITEM %llu) flags %#llx size %u\n",

		 (unsigned long long)logical,

		 logical, logical - found_key->objectid, found_key->objectid,

		 (unsigned long long)(logical - found_key->objectid),

		 found_key->offset, flags, item_size);

		 (unsigned long long)found_key->objectid,

		 (unsigned long long)found_key->offset,

		 (unsigned long long)flags, item_size);





	WARN_ON(!flags_ret);

	WARN_ON(!flags_ret);

	if (flags_ret) {

	if (flags_ret) {
@@ -1518,7 +1513,7 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info, 
		while (!ret && (root_node = ulist_next(roots, &root_uiter))) {

		while (!ret && (root_node = ulist_next(roots, &root_uiter))) {

			pr_debug("root %llu references leaf %llu, data list "

			pr_debug("root %llu references leaf %llu, data list "

				 "%#llx\n", root_node->val, ref_node->val,

				 "%#llx\n", root_node->val, ref_node->val,

				 (long long)ref_node->aux);

				 ref_node->aux);

			ret = iterate_leaf_refs((struct extent_inode_elem *)

			ret = iterate_leaf_refs((struct extent_inode_elem *)

						(uintptr_t)ref_node->aux,

						(uintptr_t)ref_node->aux,

						root_node->val,

						root_node->val,
@@ -1610,9 +1605,8 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root, 
			name_len = btrfs_inode_ref_name_len(eb, iref);

			name_len = btrfs_inode_ref_name_len(eb, iref);

			/* path must be released before calling iterate()! */

			/* path must be released before calling iterate()! */

			pr_debug("following ref at offset %u for inode %llu in "

			pr_debug("following ref at offset %u for inode %llu in "

				 "tree %llu\n", cur,

				 "tree %llu\n", cur, found_key.objectid,

				 (unsigned long long)found_key.objectid,

				 fs_root->objectid);

				 (unsigned long long)fs_root->objectid);

			ret = iterate(parent, name_len,

			ret = iterate(parent, name_len,

				      (unsigned long)(iref + 1), eb, ctx);

				      (unsigned long)(iref + 1), eb, ctx);

			if (ret)

			if (ret)

fs/btrfs/check-integrity.c

+95 −198

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/compression.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -132,9 +132,8 @@ static int check_compressed_csum(struct inode *inode, 
			printk(KERN_INFO "btrfs csum failed ino %llu "

			printk(KERN_INFO "btrfs csum failed ino %llu "

			       "extent %llu csum %u "

			       "extent %llu csum %u "

			       "wanted %u mirror %d\n",

			       "wanted %u mirror %d\n",

			       (unsigned long long)btrfs_ino(inode),

			       btrfs_ino(inode), disk_start, csum, *cb_sum,

			       (unsigned long long)disk_start,

			       cb->mirror_num);

			       csum, *cb_sum, cb->mirror_num);

			ret = -EIO;

			ret = -EIO;

			goto fail;

			goto fail;

		}

		}

fs/btrfs/ctree.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1383,14 +1383,12 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans, 




	if (trans->transaction != root->fs_info->running_transaction)

	if (trans->transaction != root->fs_info->running_transaction)

		WARN(1, KERN_CRIT "trans %llu running %llu\n",

		WARN(1, KERN_CRIT "trans %llu running %llu\n",

		       (unsigned long long)trans->transid,

		       trans->transid,

		       (unsigned long long)

		       root->fs_info->running_transaction->transid);

		       root->fs_info->running_transaction->transid);





	if (trans->transid != root->fs_info->generation)

	if (trans->transid != root->fs_info->generation)

		WARN(1, KERN_CRIT "trans %llu running %llu\n",

		WARN(1, KERN_CRIT "trans %llu running %llu\n",

		       (unsigned long long)trans->transid,

		       trans->transid, root->fs_info->generation);

		       (unsigned long long)root->fs_info->generation);





	if (!should_cow_block(trans, root, buf)) {

	if (!should_cow_block(trans, root, buf)) {

		*cow_ret = buf;

		*cow_ret = buf;

fs/btrfs/delayed-inode.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -1474,10 +1474,8 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
		printk(KERN_ERR "err add delayed dir index item(name: %s) into "

		printk(KERN_ERR "err add delayed dir index item(name: %s) into "

				"the insertion tree of the delayed node"

				"the insertion tree of the delayed node"

				"(root id: %llu, inode id: %llu, errno: %d)\n",

				"(root id: %llu, inode id: %llu, errno: %d)\n",

				name,

				name, delayed_node->root->objectid,

				(unsigned long long)delayed_node->root->objectid,

				delayed_node->inode_id, ret);

				(unsigned long long)delayed_node->inode_id,

				ret);

		BUG();

		BUG();

	}

	}

	mutex_unlock(&delayed_node->mutex);

	mutex_unlock(&delayed_node->mutex);
@@ -1548,9 +1546,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
		printk(KERN_ERR "err add delayed dir index item(index: %llu) "

		printk(KERN_ERR "err add delayed dir index item(index: %llu) "

				"into the deletion tree of the delayed node"

				"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)\n",

				(unsigned long long)index,

				index, node->root->objectid, node->inode_id,

				(unsigned long long)node->root->objectid,

				(unsigned long long)node->inode_id,

				ret);

				ret);

		BUG();

		BUG();

	}

	}