mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-20 21:51:05 +00:00
block: get rid of bio_rw and READA
These two are confusing leftover of the old world order, combining values of the REQ_OP_ and REQ_ namespaces. For callers that don't special case we mostly just replace bi_rw with bio_data_dir or op_is_write, except for the few cases where a switch over the REQ_OP_ values makes more sense. Any check for READA is replaced with an explicit check for REQ_RAHEAD. Also remove the READA alias for REQ_RAHEAD. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Mike Christie <mchristi@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
parent
3f40bf2c89
commit
70246286e9
26 changed files with 95 additions and 96 deletions
12
fs/buffer.c
12
fs/buffer.c
|
@ -153,7 +153,7 @@ static void __end_buffer_read_notouch(struct buffer_head *bh, int uptodate)
|
|||
if (uptodate) {
|
||||
set_buffer_uptodate(bh);
|
||||
} else {
|
||||
/* This happens, due to failed READA attempts. */
|
||||
/* This happens, due to failed read-ahead attempts. */
|
||||
clear_buffer_uptodate(bh);
|
||||
}
|
||||
unlock_buffer(bh);
|
||||
|
@ -1395,7 +1395,7 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size)
|
|||
{
|
||||
struct buffer_head *bh = __getblk(bdev, block, size);
|
||||
if (likely(bh)) {
|
||||
ll_rw_block(REQ_OP_READ, READA, 1, &bh);
|
||||
ll_rw_block(REQ_OP_READ, REQ_RAHEAD, 1, &bh);
|
||||
brelse(bh);
|
||||
}
|
||||
}
|
||||
|
@ -3052,14 +3052,14 @@ EXPORT_SYMBOL(submit_bh);
|
|||
/**
|
||||
* ll_rw_block: low-level access to block devices (DEPRECATED)
|
||||
* @op: whether to %READ or %WRITE
|
||||
* @op_flags: rq_flag_bits or %READA (readahead)
|
||||
* @op_flags: rq_flag_bits
|
||||
* @nr: number of &struct buffer_heads in the array
|
||||
* @bhs: array of pointers to &struct buffer_head
|
||||
*
|
||||
* ll_rw_block() takes an array of pointers to &struct buffer_heads, and
|
||||
* requests an I/O operation on them, either a %READ or a %WRITE. The third
|
||||
* %READA option is described in the documentation for generic_make_request()
|
||||
* which ll_rw_block() calls.
|
||||
* requests an I/O operation on them, either a %REQ_OP_READ or a %REQ_OP_WRITE.
|
||||
* @op_flags contains flags modifying the detailed I/O behavior, most notably
|
||||
* %REQ_RAHEAD.
|
||||
*
|
||||
* This function drops any buffer that it cannot get a lock on (with the
|
||||
* BH_Lock state bit), any buffer that appears to be clean when doing a write
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue