Re: [GIT PULL] Core block IO bits for 4.2

[Junichi Nomura]

On 06/26/15 15:41, Linus Torvalds wrote:
> On Jun 25, 2015 23:17, "Junichi Nomura" <j-nomura@xxxxxxxxxxxxx <mailto:j-nomura@xxxxxxxxxxxxx>> wrote:
>> On 06/25/15 23:37, Jens Axboe wrote:
>> >       block, dm: don't copy bios for request clones
>>
>> this change should not be pushed to mainline yet.
> 
> Hmm. I merged all of Jens' pull requests today, so it's now in my tree. What do?

Then I think following 3 commits should be reverted.

2d76fff dm: cleanup methods that requeue requests
cbc4e3c dm: do not allocate any mempools for blk-mq request-based DM
5f1b670 block, dm: don't copy bios for request clones

Reverting 5f1b670 involves conflicts in drvers/md/dm.c for
these 2 hunks due to diff contexts difference.
It's ok to revert those changes ignoring the contexts.

  @@ -1089,8 +1038,6 @@ static void free_rq_clone(struct request *clone, bool must_be_mapped)
   
          WARN_ON_ONCE(must_be_mapped && !clone->q);
   
  -       blk_rq_unprep_clone(clone);
  -
          if (md->type == DM_TYPE_MQ_REQUEST_BASED)
                  /* stacked on blk-mq queue(s) */
                  tio->ti->type->release_clone_rq(clone);

  @@ -1973,11 +1889,7 @@ static int map_request(struct dm_rq_target_io *tio, struct request *rq,
                  }
                  if (IS_ERR(clone))
                          return DM_MAPIO_REQUEUE;
  -               if (setup_clone(clone, rq, tio, GFP_ATOMIC)) {
  -                       /* -ENOMEM */
  -                       ti->type->release_clone_rq(clone);
  -                       return DM_MAPIO_REQUEUE;
  -               }
  +               setup_clone(clone, rq, tio);
          }
   
          switch (r) {

-- 
Jun'ichi Nomura, NEC Corporation--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/