aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c1
-rw-r--r--fs/btrfs/file.c8
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 8a2bcc7024f..2464c099db5 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1734,7 +1734,6 @@ struct btrfs_root *open_ctree(struct super_block *sb,
goto fail_cleaner;
if (btrfs_super_log_root(disk_super) != 0) {
- u32 blocksize;
u64 bytenr = btrfs_super_log_root(disk_super);
if (fs_devices->rw_devices == 0) {
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 1e8c024c69c..1c9243560ea 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -662,18 +662,18 @@ next_slot:
}
if (found_extent && !keep) {
- u64 disk_bytenr = le64_to_cpu(old.disk_bytenr);
+ u64 old_disk_bytenr = le64_to_cpu(old.disk_bytenr);
- if (disk_bytenr != 0) {
+ if (old_disk_bytenr != 0) {
inode_sub_bytes(inode,
le64_to_cpu(old.num_bytes));
ret = btrfs_free_extent(trans, root,
- disk_bytenr,
+ old_disk_bytenr,
le64_to_cpu(old.disk_num_bytes),
leaf_start, root_owner,
root_gen, key.objectid, 0);
BUG_ON(ret);
- *hint_byte = disk_bytenr;
+ *hint_byte = old_disk_bytenr;
}
}