From patchwork Mon May 7 08:44:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongsheng Yang X-Patchwork-Id: 10383547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2EFF560353 for ; Mon, 7 May 2018 08:45:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23849286DF for ; Mon, 7 May 2018 08:45:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1710C28A96; Mon, 7 May 2018 08:45:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFF7F286DF for ; Mon, 7 May 2018 08:45:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752488AbeEGIpP (ORCPT ); Mon, 7 May 2018 04:45:15 -0400 Received: from m97136.mail.qiye.163.com ([220.181.97.136]:5484 "EHLO m97136.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549AbeEGIoW (ORCPT ); Mon, 7 May 2018 04:44:22 -0400 Received: from atest-guest.localdomain (unknown [218.94.118.90]) by smtp2 (Coremail) with SMTP id iOCowAD3D8riEfBa7U7qAA--.740S8; Mon, 07 May 2018 16:44:20 +0800 (CST) From: Dongsheng Yang To: ceph-devel@vger.kernel.org, idryomov@gmail.com Cc: Dongsheng Yang Subject: [PATCH 6/9] rbd: wake up waiter in rbd_acquire_lock if we got -EBLACKLISTED Date: Mon, 7 May 2018 04:44:02 -0400 Message-Id: <1525682645-30510-7-git-send-email-dongsheng.yang@easystack.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1525682645-30510-1-git-send-email-dongsheng.yang@easystack.cn> References: <1525682645-30510-1-git-send-email-dongsheng.yang@easystack.cn> X-CM-TRANSID: iOCowAD3D8riEfBa7U7qAA--.740S8 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjfUpZaPUUUUU X-Originating-IP: [218.94.118.90] X-CM-SenderInfo: 5grqw2pkhqwhp1dqwq5hdv52pwdfyhdfq/1tbidwQ-eln5c7csuAAAsG Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Dongsheng Yang --- drivers/block/rbd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a13bb06..39ca0d7 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3007,7 +3007,17 @@ static void rbd_acquire_lock(struct work_struct *work) again: lock_state = rbd_try_acquire_lock(rbd_dev, &ret); if (lock_state != RBD_LOCK_STATE_UNLOCKED || ret == -EBLACKLISTED) { + bool need_wakeup = false; + + if (ret == -EBLACKLISTED) { + down_write(&rbd_dev->lock_rwsem); + set_bit(RBD_DEV_FLAG_BLACKLISTED, &rbd_dev->flags); + up_write(&rbd_dev->lock_rwsem); + need_wakeup = true; + } if (lock_state == RBD_LOCK_STATE_LOCKED) + need_wakeup = true; + if (need_wakeup) wake_requests(rbd_dev, true); dout("%s rbd_dev %p lock_state %d ret %d - done\n", __func__, rbd_dev, lock_state, ret);