diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2025-10-01 15:51:47 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2025-10-01 15:51:52 -0300 |
| commit | 09c71a76accc2f1c288f79beb68939f897c20690 (patch) | |
| tree | 0bbc6b039eeea3bb41830ab730b53913a88e2419 /fs/btrfs | |
| parent | 77768300ceddbabe787288df27bbdb9ff4832fe2 (diff) | |
| parent | da274362a7bd9ab3a6e46d15945029145ebce672 (diff) | |
Merge tag 'v6.12.49' into local/lf-6.12.20-2.0.0
This is the 6.12.49 stable release
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/tree-checker.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index ffa5b83d3a4a..14f96d217e6e 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -1744,10 +1744,10 @@ static int check_inode_ref(struct extent_buffer *leaf, while (ptr < end) { u16 namelen; - if (unlikely(ptr + sizeof(iref) > end)) { + if (unlikely(ptr + sizeof(*iref) > end)) { inode_ref_err(leaf, slot, "inode ref overflow, ptr %lu end %lu inode_ref_size %zu", - ptr, end, sizeof(iref)); + ptr, end, sizeof(*iref)); return -EUCLEAN; } diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index f917fdae7e67..0022ad003791 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1946,7 +1946,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, search_key.objectid = log_key.objectid; search_key.type = BTRFS_INODE_EXTREF_KEY; - search_key.offset = key->objectid; + search_key.offset = btrfs_extref_hash(key->objectid, name.name, name.len); ret = backref_in_log(root->log_root, &search_key, key->objectid, &name); if (ret < 0) { goto out; |