diff options
author | David Sterba <dsterba@suse.cz> | 2014-07-29 11:32:10 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-10-01 13:30:52 -0400 |
commit | aab110abcbbf06b5d52d9974b4a72d3c7cd38537 (patch) | |
tree | 2e450b46b655467c0bfc58ab60f3981e905e7e33 /fs/btrfs | |
parent | 1d52c78afbbf80b58299e076a159617d6b42fe3c (diff) |
btrfs: defrag, use unsigned type for extent thresh
Signed type mismatches the ioctl structure, all extent calculations are
done on unsigned types.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 0ff212757b95..87a7267a6bb2 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -885,7 +885,7 @@ out_unlock: | |||
885 | * file you want to defrag, we return 0 to let you know to skip this | 885 | * file you want to defrag, we return 0 to let you know to skip this |
886 | * part of the file | 886 | * part of the file |
887 | */ | 887 | */ |
888 | static int check_defrag_in_cache(struct inode *inode, u64 offset, int thresh) | 888 | static int check_defrag_in_cache(struct inode *inode, u64 offset, u32 thresh) |
889 | { | 889 | { |
890 | struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree; | 890 | struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree; |
891 | struct extent_map *em = NULL; | 891 | struct extent_map *em = NULL; |
@@ -920,7 +920,7 @@ static int check_defrag_in_cache(struct inode *inode, u64 offset, int thresh) | |||
920 | */ | 920 | */ |
921 | static int find_new_extents(struct btrfs_root *root, | 921 | static int find_new_extents(struct btrfs_root *root, |
922 | struct inode *inode, u64 newer_than, | 922 | struct inode *inode, u64 newer_than, |
923 | u64 *off, int thresh) | 923 | u64 *off, u32 thresh) |
924 | { | 924 | { |
925 | struct btrfs_path *path; | 925 | struct btrfs_path *path; |
926 | struct btrfs_key min_key; | 926 | struct btrfs_key min_key; |
@@ -1029,7 +1029,7 @@ static bool defrag_check_next_extent(struct inode *inode, struct extent_map *em) | |||
1029 | return ret; | 1029 | return ret; |
1030 | } | 1030 | } |
1031 | 1031 | ||
1032 | static int should_defrag_range(struct inode *inode, u64 start, int thresh, | 1032 | static int should_defrag_range(struct inode *inode, u64 start, u32 thresh, |
1033 | u64 *last_len, u64 *skip, u64 *defrag_end, | 1033 | u64 *last_len, u64 *skip, u64 *defrag_end, |
1034 | int compress) | 1034 | int compress) |
1035 | { | 1035 | { |
@@ -1259,7 +1259,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, | |||
1259 | int ret; | 1259 | int ret; |
1260 | int defrag_count = 0; | 1260 | int defrag_count = 0; |
1261 | int compress_type = BTRFS_COMPRESS_ZLIB; | 1261 | int compress_type = BTRFS_COMPRESS_ZLIB; |
1262 | int extent_thresh = range->extent_thresh; | 1262 | u32 extent_thresh = range->extent_thresh; |
1263 | unsigned long max_cluster = (256 * 1024) >> PAGE_CACHE_SHIFT; | 1263 | unsigned long max_cluster = (256 * 1024) >> PAGE_CACHE_SHIFT; |
1264 | unsigned long cluster = max_cluster; | 1264 | unsigned long cluster = max_cluster; |
1265 | u64 new_align = ~((u64)128 * 1024 - 1); | 1265 | u64 new_align = ~((u64)128 * 1024 - 1); |