Commit 67c0f556 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe

fs/ext4: Use the new blk_opf_t type

Improve static type checking by using the new blk_opf_t type for
variables that represent request flags.

Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Baokun Li <libaokun1@huawei.com>
Cc: Ye Bin <yebin10@huawei.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-52-bvanassche@acm.orgSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bf9486d6
...@@ -3058,14 +3058,14 @@ extern unsigned int ext4_list_backups(struct super_block *sb, ...@@ -3058,14 +3058,14 @@ extern unsigned int ext4_list_backups(struct super_block *sb,
/* super.c */ /* super.c */
extern struct buffer_head *ext4_sb_bread(struct super_block *sb, extern struct buffer_head *ext4_sb_bread(struct super_block *sb,
sector_t block, int op_flags); sector_t block, blk_opf_t op_flags);
extern struct buffer_head *ext4_sb_bread_unmovable(struct super_block *sb, extern struct buffer_head *ext4_sb_bread_unmovable(struct super_block *sb,
sector_t block); sector_t block);
extern void ext4_read_bh_nowait(struct buffer_head *bh, int op_flags, extern void ext4_read_bh_nowait(struct buffer_head *bh, blk_opf_t op_flags,
bh_end_io_t *end_io); bh_end_io_t *end_io);
extern int ext4_read_bh(struct buffer_head *bh, int op_flags, extern int ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags,
bh_end_io_t *end_io); bh_end_io_t *end_io);
extern int ext4_read_bh_lock(struct buffer_head *bh, int op_flags, bool wait); extern int ext4_read_bh_lock(struct buffer_head *bh, blk_opf_t op_flags, bool wait);
extern void ext4_sb_breadahead_unmovable(struct super_block *sb, sector_t block); extern void ext4_sb_breadahead_unmovable(struct super_block *sb, sector_t block);
extern int ext4_seq_options_show(struct seq_file *seq, void *offset); extern int ext4_seq_options_show(struct seq_file *seq, void *offset);
extern int ext4_calculate_overhead(struct super_block *sb); extern int ext4_calculate_overhead(struct super_block *sb);
......
...@@ -658,7 +658,7 @@ void ext4_fc_track_range(handle_t *handle, struct inode *inode, ext4_lblk_t star ...@@ -658,7 +658,7 @@ void ext4_fc_track_range(handle_t *handle, struct inode *inode, ext4_lblk_t star
static void ext4_fc_submit_bh(struct super_block *sb, bool is_tail) static void ext4_fc_submit_bh(struct super_block *sb, bool is_tail)
{ {
int write_flags = REQ_SYNC; blk_opf_t write_flags = REQ_SYNC;
struct buffer_head *bh = EXT4_SB(sb)->s_fc_bh; struct buffer_head *bh = EXT4_SB(sb)->s_fc_bh;
/* Add REQ_FUA | REQ_PREFLUSH only its tail */ /* Add REQ_FUA | REQ_PREFLUSH only its tail */
......
...@@ -159,7 +159,7 @@ MODULE_ALIAS("ext3"); ...@@ -159,7 +159,7 @@ MODULE_ALIAS("ext3");
#define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type) #define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type)
static inline void __ext4_read_bh(struct buffer_head *bh, int op_flags, static inline void __ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags,
bh_end_io_t *end_io) bh_end_io_t *end_io)
{ {
/* /*
...@@ -174,7 +174,7 @@ static inline void __ext4_read_bh(struct buffer_head *bh, int op_flags, ...@@ -174,7 +174,7 @@ static inline void __ext4_read_bh(struct buffer_head *bh, int op_flags,
submit_bh(REQ_OP_READ | op_flags, bh); submit_bh(REQ_OP_READ | op_flags, bh);
} }
void ext4_read_bh_nowait(struct buffer_head *bh, int op_flags, void ext4_read_bh_nowait(struct buffer_head *bh, blk_opf_t op_flags,
bh_end_io_t *end_io) bh_end_io_t *end_io)
{ {
BUG_ON(!buffer_locked(bh)); BUG_ON(!buffer_locked(bh));
...@@ -186,7 +186,7 @@ void ext4_read_bh_nowait(struct buffer_head *bh, int op_flags, ...@@ -186,7 +186,7 @@ void ext4_read_bh_nowait(struct buffer_head *bh, int op_flags,
__ext4_read_bh(bh, op_flags, end_io); __ext4_read_bh(bh, op_flags, end_io);
} }
int ext4_read_bh(struct buffer_head *bh, int op_flags, bh_end_io_t *end_io) int ext4_read_bh(struct buffer_head *bh, blk_opf_t op_flags, bh_end_io_t *end_io)
{ {
BUG_ON(!buffer_locked(bh)); BUG_ON(!buffer_locked(bh));
...@@ -203,7 +203,7 @@ int ext4_read_bh(struct buffer_head *bh, int op_flags, bh_end_io_t *end_io) ...@@ -203,7 +203,7 @@ int ext4_read_bh(struct buffer_head *bh, int op_flags, bh_end_io_t *end_io)
return -EIO; return -EIO;
} }
int ext4_read_bh_lock(struct buffer_head *bh, int op_flags, bool wait) int ext4_read_bh_lock(struct buffer_head *bh, blk_opf_t op_flags, bool wait)
{ {
if (trylock_buffer(bh)) { if (trylock_buffer(bh)) {
if (wait) if (wait)
...@@ -227,8 +227,8 @@ int ext4_read_bh_lock(struct buffer_head *bh, int op_flags, bool wait) ...@@ -227,8 +227,8 @@ int ext4_read_bh_lock(struct buffer_head *bh, int op_flags, bool wait)
* return. * return.
*/ */
static struct buffer_head *__ext4_sb_bread_gfp(struct super_block *sb, static struct buffer_head *__ext4_sb_bread_gfp(struct super_block *sb,
sector_t block, int op_flags, sector_t block,
gfp_t gfp) blk_opf_t op_flags, gfp_t gfp)
{ {
struct buffer_head *bh; struct buffer_head *bh;
int ret; int ret;
...@@ -248,7 +248,7 @@ static struct buffer_head *__ext4_sb_bread_gfp(struct super_block *sb, ...@@ -248,7 +248,7 @@ static struct buffer_head *__ext4_sb_bread_gfp(struct super_block *sb,
} }
struct buffer_head *ext4_sb_bread(struct super_block *sb, sector_t block, struct buffer_head *ext4_sb_bread(struct super_block *sb, sector_t block,
int op_flags) blk_opf_t op_flags)
{ {
return __ext4_sb_bread_gfp(sb, block, op_flags, __GFP_MOVABLE); return __ext4_sb_bread_gfp(sb, block, op_flags, __GFP_MOVABLE);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment