diff options
author | David Sterba <dsterba@suse.com> | 2017-06-06 13:03:49 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-08-16 10:12:04 -0400 |
commit | f1c77c55cda19445a490036bce497ed3af9696d7 (patch) | |
tree | f2d6f61070b24098706556f306990421fe71b99c /fs/btrfs | |
parent | abe60ba45c145db2d90609138755fbb3dbc47d00 (diff) |
btrfs: cleanup types storing REQ_*
Unify types of local variables and parameters that store various
REQ_* values to unsigned int.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/extent_io.c | 14 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index a7bebba4f9fc..339f39caa0b7 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -2756,7 +2756,8 @@ static int merge_bio(struct extent_io_tree *tree, struct page *page, | |||
2756 | 2756 | ||
2757 | } | 2757 | } |
2758 | 2758 | ||
2759 | static int submit_extent_page(int op, int op_flags, struct extent_io_tree *tree, | 2759 | static int submit_extent_page(unsigned int op, unsigned int op_flags, |
2760 | struct extent_io_tree *tree, | ||
2760 | struct writeback_control *wbc, | 2761 | struct writeback_control *wbc, |
2761 | struct page *page, sector_t sector, | 2762 | struct page *page, sector_t sector, |
2762 | size_t size, unsigned long offset, | 2763 | size_t size, unsigned long offset, |
@@ -2877,7 +2878,7 @@ static int __do_readpage(struct extent_io_tree *tree, | |||
2877 | get_extent_t *get_extent, | 2878 | get_extent_t *get_extent, |
2878 | struct extent_map **em_cached, | 2879 | struct extent_map **em_cached, |
2879 | struct bio **bio, int mirror_num, | 2880 | struct bio **bio, int mirror_num, |
2880 | unsigned long *bio_flags, int read_flags, | 2881 | unsigned long *bio_flags, unsigned int read_flags, |
2881 | u64 *prev_em_start) | 2882 | u64 *prev_em_start) |
2882 | { | 2883 | { |
2883 | struct inode *inode = page->mapping->host; | 2884 | struct inode *inode = page->mapping->host; |
@@ -3163,7 +3164,8 @@ static int __extent_read_full_page(struct extent_io_tree *tree, | |||
3163 | struct page *page, | 3164 | struct page *page, |
3164 | get_extent_t *get_extent, | 3165 | get_extent_t *get_extent, |
3165 | struct bio **bio, int mirror_num, | 3166 | struct bio **bio, int mirror_num, |
3166 | unsigned long *bio_flags, int read_flags) | 3167 | unsigned long *bio_flags, |
3168 | unsigned int read_flags) | ||
3167 | { | 3169 | { |
3168 | struct inode *inode = page->mapping->host; | 3170 | struct inode *inode = page->mapping->host; |
3169 | struct btrfs_ordered_extent *ordered; | 3171 | struct btrfs_ordered_extent *ordered; |
@@ -3310,7 +3312,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, | |||
3310 | struct extent_page_data *epd, | 3312 | struct extent_page_data *epd, |
3311 | loff_t i_size, | 3313 | loff_t i_size, |
3312 | unsigned long nr_written, | 3314 | unsigned long nr_written, |
3313 | int write_flags, int *nr_ret) | 3315 | unsigned int write_flags, int *nr_ret) |
3314 | { | 3316 | { |
3315 | struct extent_io_tree *tree = epd->tree; | 3317 | struct extent_io_tree *tree = epd->tree; |
3316 | u64 start = page_offset(page); | 3318 | u64 start = page_offset(page); |
@@ -3464,7 +3466,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, | |||
3464 | size_t pg_offset = 0; | 3466 | size_t pg_offset = 0; |
3465 | loff_t i_size = i_size_read(inode); | 3467 | loff_t i_size = i_size_read(inode); |
3466 | unsigned long end_index = i_size >> PAGE_SHIFT; | 3468 | unsigned long end_index = i_size >> PAGE_SHIFT; |
3467 | int write_flags = 0; | 3469 | unsigned int write_flags = 0; |
3468 | unsigned long nr_written = 0; | 3470 | unsigned long nr_written = 0; |
3469 | 3471 | ||
3470 | if (wbc->sync_mode == WB_SYNC_ALL) | 3472 | if (wbc->sync_mode == WB_SYNC_ALL) |
@@ -3714,7 +3716,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, | |||
3714 | unsigned long i, num_pages; | 3716 | unsigned long i, num_pages; |
3715 | unsigned long bio_flags = 0; | 3717 | unsigned long bio_flags = 0; |
3716 | unsigned long start, end; | 3718 | unsigned long start, end; |
3717 | int write_flags = (epd->sync_io ? REQ_SYNC : 0) | REQ_META; | 3719 | unsigned int write_flags = (epd->sync_io ? REQ_SYNC : 0) | REQ_META; |
3718 | int ret = 0; | 3720 | int ret = 0; |
3719 | 3721 | ||
3720 | clear_bit(EXTENT_BUFFER_WRITE_ERR, &eb->bflags); | 3722 | clear_bit(EXTENT_BUFFER_WRITE_ERR, &eb->bflags); |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3926e9cbf0d9..9349a13b3d72 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -8019,7 +8019,7 @@ static int dio_read_error(struct inode *inode, struct bio *failed_bio, | |||
8019 | struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree; | 8019 | struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree; |
8020 | struct bio *bio; | 8020 | struct bio *bio; |
8021 | int isector; | 8021 | int isector; |
8022 | int read_mode = 0; | 8022 | unsigned int read_mode = 0; |
8023 | int segs; | 8023 | int segs; |
8024 | int ret; | 8024 | int ret; |
8025 | 8025 | ||