Merge tag 'vfs-5.10-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / fs / btrfs / ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index ab408a2..69a3841 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1274,6 +1274,7 @@ static int cluster_pages_for_defrag(struct inode *inode,
        u64 page_start;
        u64 page_end;
        u64 page_cnt;
+       u64 start = (u64)start_index << PAGE_SHIFT;
        int ret;
        int i;
        int i_done;
@@ -1290,8 +1291,7 @@ static int cluster_pages_for_defrag(struct inode *inode,
        page_cnt = min_t(u64, (u64)num_pages, (u64)file_end - start_index + 1);
 
        ret = btrfs_delalloc_reserve_space(BTRFS_I(inode), &data_reserved,
-                       start_index << PAGE_SHIFT,
-                       page_cnt << PAGE_SHIFT);
+                       start, page_cnt << PAGE_SHIFT);
        if (ret)
                return ret;
        i_done = 0;
@@ -1380,8 +1380,7 @@ again:
                btrfs_mod_outstanding_extents(BTRFS_I(inode), 1);
                spin_unlock(&BTRFS_I(inode)->lock);
                btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
-                               start_index << PAGE_SHIFT,
-                               (page_cnt - i_done) << PAGE_SHIFT, true);
+                               start, (page_cnt - i_done) << PAGE_SHIFT, true);
        }
 
 
@@ -1408,8 +1407,7 @@ out:
                put_page(pages[i]);
        }
        btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,
-                       start_index << PAGE_SHIFT,
-                       page_cnt << PAGE_SHIFT, true);
+                       start, page_cnt << PAGE_SHIFT, true);
        btrfs_delalloc_release_extents(BTRFS_I(inode), page_cnt << PAGE_SHIFT);
        extent_changeset_free(data_reserved);
        return ret;