Messages in this thread | | | Date | Fri, 7 Sep 2018 10:49:42 -0700 | From | Matthew Wilcox <> | Subject | Re: [PATCH 2/6] md: convert to kvmalloc |
| |
On Fri, Sep 07, 2018 at 12:56:31PM -0400, Kent Overstreet wrote: > @@ -165,7 +164,7 @@ ops_run_partial_parity(struct stripe_head *sh, struct raid5_percpu *percpu, > struct dma_async_tx_descriptor *tx) > { > int disks = sh->disks; > - struct page **srcs = flex_array_get(percpu->scribble, 0); > + struct page **srcs = percpu->scribble; > int count = 0, pd_idx = sh->pd_idx, i; > struct async_submit_ctl submit; > > @@ -196,8 +195,8 @@ ops_run_partial_parity(struct stripe_head *sh, struct raid5_percpu *percpu, > } > > init_async_submit(&submit, ASYNC_TX_FENCE|ASYNC_TX_XOR_ZERO_DST, tx, > - NULL, sh, flex_array_get(percpu->scribble, 0) > - + sizeof(struct page *) * (sh->disks + 2)); > + NULL, sh, percpu->scribble + > + sizeof(struct page *) * (sh->disks + 2));
I think this would read better written as:
init_async_submit(&submit, ASYNC_TX_FENCE|ASYNC_TX_XOR_ZERO_DST, tx, NULL, sh, srcs + sh->disks + 2);
> static addr_conv_t *to_addr_conv(struct stripe_head *sh, > struct raid5_percpu *percpu, int i) > { > - void *addr; > - > - addr = flex_array_get(percpu->scribble, i); > - return addr + sizeof(struct page *) * (sh->disks + 2); > + return percpu->scribble + i * percpu->scribble_obj_size + > + sizeof(struct page *) * (sh->disks + 2); > } > > /* return a pointer to the address conversion region of the scribble buffer */ > static struct page **to_addr_page(struct raid5_percpu *percpu, int i) > { > - void *addr; > - > - addr = flex_array_get(percpu->scribble, i); > - return addr; > + return percpu->scribble + i * percpu->scribble_obj_size; > }
Perhaps this would be better as ...
static struct page **to_addr_page(struct raid5_percpu *percpu, int i) { - void *addr; - - addr = flex_array_get(percpu->scribble, i); - return addr; + return percpu->scribble + i * percpu->scribble_obj_size; }
static addr_conv_t *to_addr_conv(struct stripe_head *sh, struct raid5_percpu *percpu, int i) { - void *addr; - - addr = flex_array_get(percpu->scribble, i); - return addr + sizeof(struct page *) * (sh->disks + 2); + return to_addr_page(percpu, i) + sh->disks + 2; }
The rest looks good.
| |