mirror of https://gitee.com/openkylin/linux.git
lightnvm: remove unnecessary variables in rrpc
Before vectored I/Os were supported on rrpc, the physical address was stored as part of the nvm_rqd request. This variable become obsolete when the ppa_list was introduced. Cleanup this variable. Signed-off-by: Javier González <javier@cnexlabs.com> Signed-off-by: Matias Bjørling <m@bjorling.me> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
parent
0e5c3246db
commit
eb00352b52
|
@ -758,7 +758,6 @@ static int rrpc_read_ppalist_rq(struct rrpc *rrpc, struct bio *bio,
|
|||
static int rrpc_read_rq(struct rrpc *rrpc, struct bio *bio, struct nvm_rq *rqd,
|
||||
unsigned long flags)
|
||||
{
|
||||
struct rrpc_rq *rrqd = nvm_rq_to_pdu(rqd);
|
||||
int is_gc = flags & NVM_IOTYPE_GC;
|
||||
sector_t laddr = rrpc_get_laddr(bio);
|
||||
struct rrpc_addr *gp;
|
||||
|
@ -778,7 +777,6 @@ static int rrpc_read_rq(struct rrpc *rrpc, struct bio *bio, struct nvm_rq *rqd,
|
|||
}
|
||||
|
||||
rqd->opcode = NVM_OP_HBREAD;
|
||||
rrqd->addr = gp;
|
||||
|
||||
return NVM_IO_OK;
|
||||
}
|
||||
|
@ -821,7 +819,6 @@ static int rrpc_write_ppalist_rq(struct rrpc *rrpc, struct bio *bio,
|
|||
static int rrpc_write_rq(struct rrpc *rrpc, struct bio *bio,
|
||||
struct nvm_rq *rqd, unsigned long flags)
|
||||
{
|
||||
struct rrpc_rq *rrqd = nvm_rq_to_pdu(rqd);
|
||||
struct rrpc_addr *p;
|
||||
int is_gc = flags & NVM_IOTYPE_GC;
|
||||
sector_t laddr = rrpc_get_laddr(bio);
|
||||
|
@ -839,7 +836,6 @@ static int rrpc_write_rq(struct rrpc *rrpc, struct bio *bio,
|
|||
|
||||
rqd->ppa_addr = rrpc_ppa_to_gaddr(rrpc->dev, p->addr);
|
||||
rqd->opcode = NVM_OP_HBWRITE;
|
||||
rrqd->addr = p;
|
||||
|
||||
return NVM_IO_OK;
|
||||
}
|
||||
|
@ -1389,7 +1385,6 @@ static void *rrpc_init(struct nvm_dev *dev, struct gendisk *tdisk,
|
|||
INIT_WORK(&rrpc->ws_requeue, rrpc_requeue);
|
||||
|
||||
rrpc->nr_luns = lun_end - lun_begin + 1;
|
||||
rrpc->total_blocks = (unsigned long)dev->blks_per_lun * rrpc->nr_luns;
|
||||
rrpc->nr_sects = (unsigned long long)dev->sec_per_lun * rrpc->nr_luns;
|
||||
|
||||
/* simple round-robin strategy */
|
||||
|
@ -1409,7 +1404,6 @@ static void *rrpc_init(struct nvm_dev *dev, struct gendisk *tdisk,
|
|||
}
|
||||
|
||||
rrpc->poffset = dev->sec_per_lun * lun_begin;
|
||||
rrpc->lun_offset = lun_begin;
|
||||
|
||||
ret = rrpc_core_init(rrpc);
|
||||
if (ret) {
|
||||
|
|
|
@ -48,7 +48,6 @@ struct rrpc_inflight_rq {
|
|||
|
||||
struct rrpc_rq {
|
||||
struct rrpc_inflight_rq inflight_rq;
|
||||
struct rrpc_addr *addr;
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
|
@ -92,14 +91,12 @@ struct rrpc {
|
|||
|
||||
sector_t soffset; /* logical sector offset */
|
||||
u64 poffset; /* physical page offset */
|
||||
int lun_offset;
|
||||
|
||||
int nr_luns;
|
||||
struct rrpc_lun *luns;
|
||||
|
||||
/* calculated values */
|
||||
unsigned long long nr_sects;
|
||||
unsigned long total_blocks;
|
||||
|
||||
/* Write strategy variables. Move these into each for structure for each
|
||||
* strategy
|
||||
|
|
Loading…
Reference in New Issue