hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs fixes from Chris Mason:
 "Filipe is nailing down some problems with our skinny extent variation,
  and Dave's patch fixes endian problems in the new super block checks"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix race that makes btrfs_lookup_extent_info miss skinny extent items
  Btrfs: properly clean up btrfs_end_io_wq_cache
  Btrfs: fix invalid leaf slot access in btrfs_lookup_extent()
  btrfs: use macro accessors in superblock validation checks
This commit is contained in:
Linus Torvalds 2014-11-01 10:41:26 -07:00
parent 9f935675d4 d05a2b4cd9
commit 4f4274af70
5 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.h
View File

@ -3276,7 +3276,7 @@ int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,
struct btrfs_root *root, unsigned long count); struct btrfs_root *root, unsigned long count);
int btrfs_async_run_delayed_refs(struct btrfs_root *root, int btrfs_async_run_delayed_refs(struct btrfs_root *root,
unsigned long count, int wait); unsigned long count, int wait);
int btrfs_lookup_extent(struct btrfs_root *root, u64 start, u64 len); int btrfs_lookup_data_extent(struct btrfs_root *root, u64 start, u64 len);
int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 bytenr, struct btrfs_root *root, u64 bytenr,
u64 offset, int metadata, u64 *refs, u64 *flags); u64 offset, int metadata, u64 *refs, u64 *flags);

43
fs/btrfs/disk-io.c
View File

@ -3817,19 +3817,19 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
struct btrfs_super_block *sb = fs_info->super_copy; struct btrfs_super_block *sb = fs_info->super_copy;
int ret = 0; int ret = 0;
if (sb->root_level > BTRFS_MAX_LEVEL) { if (btrfs_super_root_level(sb) >= BTRFS_MAX_LEVEL) {
printk(KERN_ERR "BTRFS: tree_root level too big: %d > %d\n", printk(KERN_ERR "BTRFS: tree_root level too big: %d >= %d\n",
sb->root_level, BTRFS_MAX_LEVEL); btrfs_super_root_level(sb), BTRFS_MAX_LEVEL);
ret = -EINVAL; ret = -EINVAL;
} }
if (sb->chunk_root_level > BTRFS_MAX_LEVEL) { if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {
printk(KERN_ERR "BTRFS: chunk_root level too big: %d > %d\n", printk(KERN_ERR "BTRFS: chunk_root level too big: %d >= %d\n",
sb->chunk_root_level, BTRFS_MAX_LEVEL); btrfs_super_chunk_root_level(sb), BTRFS_MAX_LEVEL);
ret = -EINVAL; ret = -EINVAL;
} }
if (sb->log_root_level > BTRFS_MAX_LEVEL) { if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) {
printk(KERN_ERR "BTRFS: log_root level too big: %d > %d\n", printk(KERN_ERR "BTRFS: log_root level too big: %d >= %d\n",
sb->log_root_level, BTRFS_MAX_LEVEL); btrfs_super_log_root_level(sb), BTRFS_MAX_LEVEL);
ret = -EINVAL; ret = -EINVAL;
} }
@ -3837,15 +3837,15 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
* The common minimum, we don't know if we can trust the nodesize/sectorsize * The common minimum, we don't know if we can trust the nodesize/sectorsize
* items yet, they'll be verified later. Issue just a warning. * items yet, they'll be verified later. Issue just a warning.
*/ */
if (!IS_ALIGNED(sb->root, 4096)) if (!IS_ALIGNED(btrfs_super_root(sb), 4096))
printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n", printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",
sb->root); sb->root);
if (!IS_ALIGNED(sb->chunk_root, 4096)) if (!IS_ALIGNED(btrfs_super_chunk_root(sb), 4096))
printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n", printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",
sb->chunk_root); sb->chunk_root);
if (!IS_ALIGNED(sb->log_root, 4096)) if (!IS_ALIGNED(btrfs_super_log_root(sb), 4096))
printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n", printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",
sb->log_root); btrfs_super_log_root(sb));
if (memcmp(fs_info->fsid, sb->dev_item.fsid, BTRFS_UUID_SIZE) != 0) { if (memcmp(fs_info->fsid, sb->dev_item.fsid, BTRFS_UUID_SIZE) != 0) {
printk(KERN_ERR "BTRFS: dev_item UUID does not match fsid: %pU != %pU\n", printk(KERN_ERR "BTRFS: dev_item UUID does not match fsid: %pU != %pU\n",
@ -3857,13 +3857,13 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
* Hint to catch really bogus numbers, bitflips or so, more exact checks are * Hint to catch really bogus numbers, bitflips or so, more exact checks are
* done later * done later
*/ */
if (sb->num_devices > (1UL << 31)) if (btrfs_super_num_devices(sb) > (1UL << 31))
printk(KERN_WARNING "BTRFS: suspicious number of devices: %llu\n", printk(KERN_WARNING "BTRFS: suspicious number of devices: %llu\n",
sb->num_devices); btrfs_super_num_devices(sb));
if (sb->bytenr != BTRFS_SUPER_INFO_OFFSET) { if (btrfs_super_bytenr(sb) != BTRFS_SUPER_INFO_OFFSET) {
printk(KERN_ERR "BTRFS: super offset mismatch %llu != %u\n", printk(KERN_ERR "BTRFS: super offset mismatch %llu != %u\n",
sb->bytenr, BTRFS_SUPER_INFO_OFFSET); btrfs_super_bytenr(sb), BTRFS_SUPER_INFO_OFFSET);
ret = -EINVAL; ret = -EINVAL;
} }
@ -3871,14 +3871,15 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
* The generation is a global counter, we'll trust it more than the others * The generation is a global counter, we'll trust it more than the others
* but it's still possible that it's the one that's wrong. * but it's still possible that it's the one that's wrong.
*/ */
if (sb->generation < sb->chunk_root_generation) if (btrfs_super_generation(sb) < btrfs_super_chunk_root_generation(sb))
printk(KERN_WARNING printk(KERN_WARNING
"BTRFS: suspicious: generation < chunk_root_generation: %llu < %llu\n", "BTRFS: suspicious: generation < chunk_root_generation: %llu < %llu\n",
sb->generation, sb->chunk_root_generation); btrfs_super_generation(sb), btrfs_super_chunk_root_generation(sb));
if (sb->generation < sb->cache_generation && sb->cache_generation != (u64)-1) if (btrfs_super_generation(sb) < btrfs_super_cache_generation(sb)
&& btrfs_super_cache_generation(sb) != (u64)-1)
printk(KERN_WARNING printk(KERN_WARNING
"BTRFS: suspicious: generation < cache_generation: %llu < %llu\n", "BTRFS: suspicious: generation < cache_generation: %llu < %llu\n",
sb->generation, sb->cache_generation); btrfs_super_generation(sb), btrfs_super_cache_generation(sb));
return ret; return ret;
} }

18
fs/btrfs/extent-tree.c
View File

@ -710,8 +710,8 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info)
rcu_read_unlock(); rcu_read_unlock();
} }
/* simple helper to search for an existing extent at a given offset */ /* simple helper to search for an existing data extent at a given offset */
int btrfs_lookup_extent(struct btrfs_root *root, u64 start, u64 len) int btrfs_lookup_data_extent(struct btrfs_root *root, u64 start, u64 len)
{ {
int ret; int ret;
struct btrfs_key key; struct btrfs_key key;
@ -726,12 +726,6 @@ int btrfs_lookup_extent(struct btrfs_root *root, u64 start, u64 len)
key.type = BTRFS_EXTENT_ITEM_KEY; key.type = BTRFS_EXTENT_ITEM_KEY;
ret = btrfs_search_slot(NULL, root->fs_info->extent_root, &key, path, ret = btrfs_search_slot(NULL, root->fs_info->extent_root, &key, path,
0, 0); 0, 0);
if (ret > 0) {
btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
if (key.objectid == start &&
key.type == BTRFS_METADATA_ITEM_KEY)
ret = 0;
}
btrfs_free_path(path); btrfs_free_path(path);
return ret; return ret;
} }
@ -786,7 +780,6 @@ search_again:
else else
key.type = BTRFS_EXTENT_ITEM_KEY; key.type = BTRFS_EXTENT_ITEM_KEY;
again:
ret = btrfs_search_slot(trans, root->fs_info->extent_root, ret = btrfs_search_slot(trans, root->fs_info->extent_root,
&key, path, 0, 0); &key, path, 0, 0);
if (ret < 0) if (ret < 0)
@ -802,13 +795,6 @@ again:
key.offset == root->nodesize) key.offset == root->nodesize)
ret = 0; ret = 0;
} }
if (ret) {
key.objectid = bytenr;
key.type = BTRFS_EXTENT_ITEM_KEY;
key.offset = root->nodesize;
btrfs_release_path(path);
goto again;
}
} }
if (ret == 0) { if (ret == 0) {

1
fs/btrfs/super.c
View File

@ -2151,6 +2151,7 @@ static void __exit exit_btrfs_fs(void)
extent_map_exit(); extent_map_exit();
extent_io_exit(); extent_io_exit();
btrfs_interface_exit(); btrfs_interface_exit();
btrfs_end_io_wq_exit();
unregister_filesystem(&btrfs_fs_type); unregister_filesystem(&btrfs_fs_type);
btrfs_exit_sysfs(); btrfs_exit_sysfs();
btrfs_cleanup_fs_uuids(); btrfs_cleanup_fs_uuids();

2
fs/btrfs/tree-log.c
View File

@ -672,7 +672,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
* is this extent already allocated in the extent * is this extent already allocated in the extent
* allocation tree? If so, just add a reference * allocation tree? If so, just add a reference
*/ */
ret = btrfs_lookup_extent(root, ins.objectid, ret = btrfs_lookup_data_extent(root, ins.objectid,
ins.offset); ins.offset);
if (ret == 0) { if (ret == 0) {
ret = btrfs_inc_extent_ref(trans, root, ret = btrfs_inc_extent_ref(trans, root,