From 79e76cfa08f7fdb070fc7a9018688e9e8cd683a6 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 20 Mar 2013 15:07:24 +1100 Subject: [PATCH] mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation-fix rename _submit_bh()'s `flags' to `bio_flags', delobotomize the _submit_bh declaration Cc: Adrian Hunter Cc: Andy Lutomirski Cc: Artem Bityutskiy Cc: Darrick J. Wong Cc: Jan Kara Cc: Jens Axboe Signed-off-by: Andrew Morton --- fs/buffer.c | 4 ++-- include/linux/buffer_head.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 8c1c21ac3804..6fcad24b132b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2949,7 +2949,7 @@ static void guard_bh_eod(int rw, struct bio *bio, struct buffer_head *bh) } } -int _submit_bh(int rw, struct buffer_head * bh, unsigned long flags) +int _submit_bh(int rw, struct buffer_head * bh, unsigned long bio_flags) { struct bio *bio; int ret = 0; @@ -2984,7 +2984,7 @@ int _submit_bh(int rw, struct buffer_head * bh, unsigned long flags) bio->bi_end_io = end_bio_bh_io_sync; bio->bi_private = bh; - bio->bi_flags |= flags; + bio->bi_flags |= bio_flags; /* Take care of bh's that straddle the end of the device */ guard_bh_eod(rw, bio, bh); diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 714d5d97a8d1..4c16c4a88d47 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -181,7 +181,7 @@ void ll_rw_block(int, int, struct buffer_head * bh[]); int sync_dirty_buffer(struct buffer_head *bh); int __sync_dirty_buffer(struct buffer_head *bh, int rw); void write_dirty_buffer(struct buffer_head *bh, int rw); -int _submit_bh(int, struct buffer_head *, unsigned long); +int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags); int submit_bh(int, struct buffer_head *); void write_boundary_block(struct block_device *bdev, sector_t bblock, unsigned blocksize); -- 2.39.5