]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osdc/Objecter: For func op_cancel_writes it can directly call op_cancel.
authorJianpeng Ma <jianpeng.ma@intel.com>
Thu, 20 Aug 2015 07:38:58 +0000 (15:38 +0800)
committerLoic Dachary <ldachary@redhat.com>
Fri, 2 Oct 2015 13:37:56 +0000 (15:37 +0200)
commitd815e0aacb4a516f4bbbb59a2b2073b38759d9e8
tree20fd85f9485a56dd67e3196c327507fb9e137334
parent53316f3694c2a219541dcbdb0269ce97e2d2e9d7
osdc/Objecter: For func op_cancel_writes it can directly call op_cancel.

Becasue we get write-lock of rwlock, so it is safe to call op_cancel
rather than _op_canchel(homeless_session for this case don't met).

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit e4ce619fe17a7a9dfc18e6af0b84928aa2d88c00)

Conflicts:
      src/osdc/Objecter.cc: the last if (found) was incorrectly
      implemented as if (to_cancel.size()) after hammer. The
      conflict is because the patch tries to revert an incorrect
      if (to_cancel.size()) which is not in hammer.
src/osdc/Objecter.cc