These were local variables until commit f08068df4aa4 ("ceph: extend
ceph_writeback_ctl for ceph_writepages_start() refactoring"), but were
moved to the struct ceph_writeback_ctl for no obvious reason. Having
these in a struct means overhead, so let's move them back.
For the "allocate new pages array for next request" code block,
however I decided to introduce a new local variable `old_pages`
instead, because reusing `data_pages` for reallocation seemed
confusing to me.
Signed-off-by: Max Kellermann <max.kellermann@xxxxxxxxx>
---
v1 -> v2: now really removed "op_idx" from the struct (d'oh)
---
fs/ceph/addr.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 8b202d789e93..88dea8887ef7 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -601,7 +601,6 @@ struct ceph_writeback_ctl
unsigned int max_pages;
unsigned int locked_pages;
- int op_idx;
int num_ops;
u64 offset;
u64 len;
@@ -611,7 +610,6 @@ struct ceph_writeback_ctl
bool from_pool;
struct page **pages;
- struct page **data_pages;
};
/*
@@ -1051,7 +1049,6 @@ void ceph_init_writeback_ctl(struct address_space *mapping,
ceph_wbc->tag = PAGECACHE_TAG_DIRTY;
}
- ceph_wbc->op_idx = -1;
ceph_wbc->num_ops = 0;
ceph_wbc->offset = 0;
ceph_wbc->len = 0;
@@ -1060,7 +1057,6 @@ void ceph_init_writeback_ctl(struct address_space *mapping,
ceph_folio_batch_init(ceph_wbc);
ceph_wbc->pages = NULL;
- ceph_wbc->data_pages = NULL;
}
static inline
@@ -1417,10 +1413,12 @@ int ceph_submit_write(struct address_space *mapping,
struct ceph_vino vino = ceph_vino(inode);
struct ceph_osd_request *req = NULL;
struct page *page = NULL;
+ struct page **data_pages;
bool caching = ceph_is_cache_enabled(inode);
u64 offset;
u64 len;
unsigned i;
+ int op_idx;
new_request:
offset = ceph_fscrypt_page_offset(ceph_wbc->pages[0]);
@@ -1481,8 +1479,8 @@ int ceph_submit_write(struct address_space *mapping,
/* Format the osd request message and submit the write */
len = 0;
- ceph_wbc->data_pages = ceph_wbc->pages;
- ceph_wbc->op_idx = 0;
+ data_pages = ceph_wbc->pages;
+ op_idx = 0;
for (i = 0; i < ceph_wbc->locked_pages; i++) {
u64 cur_offset;
@@ -1495,29 +1493,29 @@ int ceph_submit_write(struct address_space *mapping,
*/
if (offset + len != cur_offset) {
/* If it's full, stop here */
- if (ceph_wbc->op_idx + 1 == req->r_num_ops)
+ if (op_idx + 1 == req->r_num_ops)
break;
/* Kick off an fscache write with what we have so far. */
ceph_fscache_write_to_cache(inode, offset, len, caching);
/* Start a new extent */
- osd_req_op_extent_dup_last(req, ceph_wbc->op_idx,
+ osd_req_op_extent_dup_last(req, op_idx,
cur_offset - offset);
doutc(cl, "got pages at %llu~%llu\n", offset, len);
- osd_req_op_extent_osd_data_pages(req, ceph_wbc->op_idx,
- ceph_wbc->data_pages,
+ osd_req_op_extent_osd_data_pages(req, op_idx,
+ data_pages,
len, 0,
ceph_wbc->from_pool,
false);
- osd_req_op_extent_update(req, ceph_wbc->op_idx, len);
+ osd_req_op_extent_update(req, op_idx, len);
len = 0;
offset = cur_offset;
- ceph_wbc->data_pages = ceph_wbc->pages + i;
- ceph_wbc->op_idx++;
+ data_pages = ceph_wbc->pages + i;
+ op_idx++;
}
set_page_writeback(page);
@@ -1555,25 +1553,27 @@ int ceph_submit_write(struct address_space *mapping,
offset, len);
}
- osd_req_op_extent_osd_data_pages(req, ceph_wbc->op_idx,
- ceph_wbc->data_pages, len,
+ osd_req_op_extent_osd_data_pages(req, op_idx,
+ data_pages, len,
0, ceph_wbc->from_pool, false);
- osd_req_op_extent_update(req, ceph_wbc->op_idx, len);
+ osd_req_op_extent_update(req, op_idx, len);
- BUG_ON(ceph_wbc->op_idx + 1 != req->r_num_ops);
+ BUG_ON(op_idx + 1 != req->r_num_ops);
ceph_wbc->from_pool = false;
if (i < ceph_wbc->locked_pages) {
+ struct page **old_pages;
+
BUG_ON(ceph_wbc->num_ops <= req->r_num_ops);
ceph_wbc->num_ops -= req->r_num_ops;
ceph_wbc->locked_pages -= i;
/* allocate new pages array for next request */
- ceph_wbc->data_pages = ceph_wbc->pages;
+ old_pages = ceph_wbc->pages;
__ceph_allocate_page_array(ceph_wbc, ceph_wbc->locked_pages);
- memcpy(ceph_wbc->pages, ceph_wbc->data_pages + i,
+ memcpy(ceph_wbc->pages, old_pages + i,
ceph_wbc->locked_pages * sizeof(*ceph_wbc->pages));
- memset(ceph_wbc->data_pages + i, 0,
+ memset(old_pages + i, 0,
ceph_wbc->locked_pages * sizeof(*ceph_wbc->pages));
} else {
BUG_ON(ceph_wbc->num_ops != req->r_num_ops);
--
2.47.2
