> 2022年7月15日 02:06,Bart Van Assche <bvanassche@xxxxxxx> 写道: > > Improve uniformity in the kernel of handling of request operation and > flags by passing these as a single argument. > > Cc: Coly Li <colyli@xxxxxxx> > Cc: Mingzhe Zou <mingzhe.zou@xxxxxxxxxxxx> > Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx> Asked-by: Coly Li <colyli@xxxxxxx> Thanks. Coly Li > --- > drivers/md/bcache/super.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c > index a2f61a2225d2..ba3909bb6bea 100644 > --- a/drivers/md/bcache/super.c > +++ b/drivers/md/bcache/super.c > @@ -587,8 +587,7 @@ static void prio_endio(struct bio *bio) > closure_put(&ca->prio); > } > > -static void prio_io(struct cache *ca, uint64_t bucket, int op, > - unsigned long op_flags) > +static void prio_io(struct cache *ca, uint64_t bucket, blk_opf_t opf) > { > struct closure *cl = &ca->prio; > struct bio *bio = bch_bbio_alloc(ca->set); > @@ -601,7 +600,7 @@ static void prio_io(struct cache *ca, uint64_t bucket, int op, > > bio->bi_end_io = prio_endio; > bio->bi_private = ca; > - bio_set_op_attrs(bio, op, REQ_SYNC|REQ_META|op_flags); > + bio->bi_opf = opf | REQ_SYNC | REQ_META; > bch_bio_map(bio, ca->disk_buckets); > > closure_bio_submit(ca->set, bio, &ca->prio); > @@ -661,7 +660,7 @@ int bch_prio_write(struct cache *ca, bool wait) > BUG_ON(bucket == -1); > > mutex_unlock(&ca->set->bucket_lock); > - prio_io(ca, bucket, REQ_OP_WRITE, 0); > + prio_io(ca, bucket, REQ_OP_WRITE); > mutex_lock(&ca->set->bucket_lock); > > ca->prio_buckets[i] = bucket; > @@ -705,7 +704,7 @@ static int prio_read(struct cache *ca, uint64_t bucket) > ca->prio_last_buckets[bucket_nr] = bucket; > bucket_nr++; > > - prio_io(ca, bucket, REQ_OP_READ, 0); > + prio_io(ca, bucket, REQ_OP_READ); > > if (p->csum != > bch_crc64(&p->magic, meta_bucket_bytes(&ca->sb) - 8)) {