From: Jérôme Glisse <jglisse@xxxxxxxxxx>
Use bvec_put_page_dirty*() instead of set_page_dirty*() followed by a call
to bvec_put_page(). With this change we can use the proper put_user_page*()
helpers.
Signed-off-by: Jérôme Glisse <jglisse@xxxxxxxxxx>
Cc: linux-fsdevel@xxxxxxxxxxxxxxx
Cc: linux-block@xxxxxxxxxxxxxxx
Cc: linux-mm@xxxxxxxxx
Cc: John Hubbard <jhubbard@xxxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Johannes Thumshirn <jthumshirn@xxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Ming Lei <ming.lei@xxxxxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: Jason Gunthorpe <jgg@xxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
---
block/bio.c | 8 ++------
fs/block_dev.c | 8 +++-----
fs/ceph/file.c | 6 +-----
fs/cifs/misc.c | 8 +++-----
4 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/block/bio.c b/block/bio.c
index b74b81085f3a..efd254c90974 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1448,12 +1448,8 @@ static void __bio_unmap_user(struct bio *bio)
/*
* make sure we dirty pages we wrote to
*/
- bio_for_each_segment_all(bvec, bio, i, iter_all) {
- if (bio_data_dir(bio) == READ)
- set_page_dirty_lock(bvec_page(bvec));
-
- bvec_put_page(bvec);
- }
+ bio_for_each_segment_all(bvec, bio, i, iter_all)
+ bvec_put_page_dirty_lock(bvec, bio_data_dir(bio) == READ);
bio_put(bio);
}
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9761f7943774..16a17fae6694 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -261,11 +261,9 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
}
__set_current_state(TASK_RUNNING);
- bio_for_each_segment_all(bvec, &bio, i, iter_all) {
- if (should_dirty && !PageCompound(bvec_page(bvec)))
- set_page_dirty_lock(bvec_page(bvec));
- bvec_put_page(bvec);
- }
+ bio_for_each_segment_all(bvec, &bio, i, iter_all)
+ bvec_put_page_dirty_lock(bvec, should_dirty &&
+ !PageCompound(bvec_page(bvec)));
if (unlikely(bio.bi_status))
ret = blk_status_to_errno(bio.bi_status);
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 6a39347f4956..d5561662b902 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -160,11 +160,7 @@ static void put_bvecs(struct bio_vec *bvecs, int num_bvecs, bool should_dirty)
int i;
for (i = 0; i < num_bvecs; i++) {
- if (bvec_page(&bvecs[i])) {
- if (should_dirty)
- set_page_dirty_lock(bvec_page(&bvecs[i]));
- bvec_put_page(&bvecs[i]);
- }
+ bvec_put_page_dirty_lock(&bvecs[i], should_dirty);
}
kvfree(bvecs);
}
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 86d78f297526..bc77a4a5f1af 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -800,11 +800,9 @@ cifs_aio_ctx_release(struct kref *refcount)
if (ctx->bv) {
unsigned i;
- for (i = 0; i < ctx->npages; i++) {
- if (ctx->should_dirty)
- set_page_dirty(bvec_page(&ctx->bv[i]));
- bvec_put_page(&ctx->bv[i]);
- }
+ for (i = 0; i < ctx->npages; i++)
+ bvec_put_page_dirty_lock(&ctx->bv[i],
+ ctx->should_dirty);
kvfree(ctx->bv);
}
--
2.20.1
