btrfs: make btrfs_start_delalloc_root's nr argument a long

It's currently u64 which gets instantly translated either to LONG_MAX
(if U64_MAX is passed) or cast to an unsigned long (which is in fact,
wrong because writeback_control::nr_to_write is a signed, long type).

Just convert the function's argument to be long time which obviates the
need to manually convert u64 value to a long. Adjust all call sites
which pass U64_MAX to pass LONG_MAX. Finally ensure that in
shrink_delalloc the u64 is converted to a long without overflowing,
resulting in a negative number.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index f5c636b29451fc20a19baadb7a2d5e5f045abcef..ed6bb46a2572e13e9ddace1464be3024f1ca08e0 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3100,7 +3100,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
                               u32 min_type);
 
 int btrfs_start_delalloc_snapshot(struct btrfs_root *root);
                               u32 min_type);
 
 int btrfs_start_delalloc_snapshot(struct btrfs_root *root);

-int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr,
+int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,

                               bool in_reclaim_context);
 int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
                              unsigned int extra_bits,
                               bool in_reclaim_context);
 int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
                              unsigned int extra_bits,

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 324f646d6e5e273b944235abe67721a0e3c607fe..bc73f798ce3a89295bf4c7588dc75ff252b24081 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -715,7 +715,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
         * flush all outstanding I/O and inode extent mappings before the
         * copy operation is declared as being finished
         */
         * flush all outstanding I/O and inode extent mappings before the
         * copy operation is declared as being finished
         */

-       ret = btrfs_start_delalloc_roots(fs_info, U64_MAX, false);
+       ret = btrfs_start_delalloc_roots(fs_info, LONG_MAX, false);

        if (ret) {
                mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
                return ret;
        if (ret) {
                mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
                return ret;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index af5558f872438d97d7a5c53ae35d5cba98044fe6..17418a75e3c8eff1a555ce4c8fd3d79247b987a4 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9489,11 +9489,11 @@ int btrfs_start_delalloc_snapshot(struct btrfs_root *root)
        return start_delalloc_inodes(root, &wbc, true, false);
 }
 
        return start_delalloc_inodes(root, &wbc, true, false);
 }
 

-int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr,
+int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,

                               bool in_reclaim_context)
 {
        struct writeback_control wbc = {
                               bool in_reclaim_context)
 {
        struct writeback_control wbc = {

-               .nr_to_write = (nr == U64_MAX) ? LONG_MAX : (unsigned long)nr,
+               .nr_to_write = nr,

                .sync_mode = WB_SYNC_NONE,
                .range_start = 0,
                .range_end = LLONG_MAX,
                .sync_mode = WB_SYNC_NONE,
                .range_start = 0,
                .range_end = LLONG_MAX,


@@ -9515,7 +9515,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr,
                 * Reset nr_to_write here so we know that we're doing a full
                 * flush.
                 */
                 * Reset nr_to_write here so we know that we're doing a full
                 * flush.
                 */

-               if (nr == U64_MAX)
+               if (nr == LONG_MAX)

                        wbc.nr_to_write = LONG_MAX;
 
                root = list_first_entry(&splice, struct btrfs_root,
                        wbc.nr_to_write = LONG_MAX;
 
                root = list_first_entry(&splice, struct btrfs_root,

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 5b9b0a390f0ead9a93cc4e2f95517f16d587df1a..7f2935ea8d3aba5888b02ba5fc282a211ad09d44 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4946,7 +4946,7 @@ long btrfs_ioctl(struct file *file, unsigned int
        case BTRFS_IOC_SYNC: {
                int ret;
 
        case BTRFS_IOC_SYNC: {
                int ret;
 

-               ret = btrfs_start_delalloc_roots(fs_info, U64_MAX, false);
+               ret = btrfs_start_delalloc_roots(fs_info, LONG_MAX, false);

                if (ret)
                        return ret;
                ret = btrfs_sync_fs(inode->i_sb, 1);
                if (ret)
                        return ret;
                ret = btrfs_sync_fs(inode->i_sb, 1);

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index e8347461c8ddddeee4169dc8df66171b7f0dce7f..84fb94e78a8ff28cd144e52412ab84ec57666455 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -532,7 +532,8 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info,
 
        loops = 0;
        while ((delalloc_bytes || dio_bytes) && loops < 3) {
 
        loops = 0;
        while ((delalloc_bytes || dio_bytes) && loops < 3) {

-               u64 nr_pages = min(delalloc_bytes, to_reclaim) >> PAGE_SHIFT;
+               u64 temp = min(delalloc_bytes, to_reclaim) >> PAGE_SHIFT;
+               long nr_pages = min_t(u64, temp, LONG_MAX);

 
                btrfs_start_delalloc_roots(fs_info, nr_pages, true);
 
 
                btrfs_start_delalloc_roots(fs_info, nr_pages, true);