projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'printk-for-5.20-sane' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
fs
/
gfs2
/
meta_io.c
diff --git
a/fs/gfs2/meta_io.c
b/fs/gfs2/meta_io.c
index
868dcc7
..
7e70e0b
100644
(file)
--- a/
fs/gfs2/meta_io.c
+++ b/
fs/gfs2/meta_io.c
@@
-34,7
+34,7
@@
static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb
{
struct buffer_head *bh, *head;
int nr_underway = 0;
{
struct buffer_head *bh, *head;
int nr_underway = 0;
-
in
t write_flags = REQ_META | REQ_PRIO | wbc_to_write_flags(wbc);
+
blk_opf_
t write_flags = REQ_META | REQ_PRIO | wbc_to_write_flags(wbc);
BUG_ON(!PageLocked(page));
BUG_ON(!page_has_buffers(page));
BUG_ON(!PageLocked(page));
BUG_ON(!page_has_buffers(page));
@@
-75,7
+75,7
@@
static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb
do {
struct buffer_head *next = bh->b_this_page;
if (buffer_async_write(bh)) {
do {
struct buffer_head *next = bh->b_this_page;
if (buffer_async_write(bh)) {
- submit_bh(REQ_OP_WRITE
,
write_flags, bh);
+ submit_bh(REQ_OP_WRITE
|
write_flags, bh);
nr_underway++;
}
bh = next;
nr_underway++;
}
bh = next;
@@
-217,14
+217,13
@@
static void gfs2_meta_read_endio(struct bio *bio)
* Submit several consecutive buffer head I/O requests as a single bio I/O
* request. (See submit_bh_wbc.)
*/
* Submit several consecutive buffer head I/O requests as a single bio I/O
* request. (See submit_bh_wbc.)
*/
-static void gfs2_submit_bhs(int op, int op_flags, struct buffer_head *bhs[],
- int num)
+static void gfs2_submit_bhs(blk_opf_t opf, struct buffer_head *bhs[], int num)
{
while (num > 0) {
struct buffer_head *bh = *bhs;
struct bio *bio;
{
while (num > 0) {
struct buffer_head *bh = *bhs;
struct bio *bio;
- bio = bio_alloc(bh->b_bdev, num, op
| op_flags
, GFP_NOIO);
+ bio = bio_alloc(bh->b_bdev, num, op
f
, GFP_NOIO);
bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
while (num > 0) {
bh = *bhs;
bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
while (num > 0) {
bh = *bhs;
@@
-288,7
+287,7
@@
int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
}
}
}
}
- gfs2_submit_bhs(REQ_OP_READ
,
REQ_META | REQ_PRIO, bhs, num);
+ gfs2_submit_bhs(REQ_OP_READ
|
REQ_META | REQ_PRIO, bhs, num);
if (!(flags & DIO_WAIT))
return 0;
if (!(flags & DIO_WAIT))
return 0;
@@
-527,7
+526,7
@@
struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen)
if (buffer_uptodate(first_bh))
goto out;
if (!buffer_locked(first_bh))
if (buffer_uptodate(first_bh))
goto out;
if (!buffer_locked(first_bh))
- ll_rw_block(REQ_OP_READ
,
REQ_META | REQ_PRIO, 1, &first_bh);
+ ll_rw_block(REQ_OP_READ
|
REQ_META | REQ_PRIO, 1, &first_bh);
dblock++;
extlen--;
dblock++;
extlen--;
@@
-536,9
+535,8
@@
struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen)
bh = gfs2_getbuf(gl, dblock, CREATE);
if (!buffer_uptodate(bh) && !buffer_locked(bh))
bh = gfs2_getbuf(gl, dblock, CREATE);
if (!buffer_uptodate(bh) && !buffer_locked(bh))
- ll_rw_block(REQ_OP_READ,
- REQ_RAHEAD | REQ_META | REQ_PRIO,
- 1, &bh);
+ ll_rw_block(REQ_OP_READ | REQ_RAHEAD | REQ_META |
+ REQ_PRIO, 1, &bh);
brelse(bh);
dblock++;
extlen--;
brelse(bh);
dblock++;
extlen--;