Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp444895ybz; Fri, 17 Apr 2020 04:09:08 -0700 (PDT) X-Google-Smtp-Source: APiQypKN/ZSTQiMelxsY5Kg8/KKQbrfDY6VSvdpCU19q6EzpbNsdoG6f5qHkcDxMBuyZn2xv5YT8 X-Received: by 2002:a17:906:1e47:: with SMTP id i7mr2465432ejj.286.1587121748449; Fri, 17 Apr 2020 04:09:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587121748; cv=none; d=google.com; s=arc-20160816; b=tx/JrY4TIVLacIlkkTA5k6sO/ZVer678kjxlMVYfh2busOMIaMkzBHb3eBerGk3PAZ 9UWpBUbFG9ZQo4mGyZoop45jY0kFZIOnLmUCNODAdS4NozF8ZisYkNpD2MzIBROWKl8t 9JrZt/r3D72r9dL1ftxQmU/t/Nieuy6zvtfiLXuIaK1VrzSA7ru3Q/s/7WHMuEw2dUfo Y0Bms9gPRwAx7MJIHIwsD7MhFgVoYLjSqh+14EUI+oOERONM5tBC+sVlVuSdO9REDsM8 4/K00TPtdSfUQd4aVyGzQS+legYYiW8shmkdfAscxohB3FZ5SKRm4Ns0aEx4hmcqODrj gNfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=qNf9by9mVcx85HZ3Z+9xf1bxw2bCzaI4yFqKMgY25eU=; b=X1Uvlp7+cfrESaWE0tAzuUQRlI55u5doTLxdXvA7GGjIN1qLVo2/iC/qEZ4h1xR+Pd qoJd5x7aA1H4XyrsDcE2+ZTGqUddIshpZisskkERP0R7aZhMj4ru8dt4xlkD6rBDvbgD CYVw74DAovFtT04wFLbvIMuILSRwrn8V/6VW87boLVMm6SXXHSY3cOOOrZ1PjsovbkSM 2SRz9Hb74nHkXVH0j0Meg8birUhZIUhtwGLMwJFN7K7YjiAlz1KwbNxlEgWJkKdoRuSC bveXpH08PDh7ge77uMk+DO20f9nc8y1qklhKHlRVbreXQGqzqOViFF/YWCadLE0zTi0/ kIdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=vECTsvEY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c12si11288781edr.596.2020.04.17.04.08.45; Fri, 17 Apr 2020 04:09:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=vECTsvEY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730115AbgDQLHb (ORCPT + 99 others); Fri, 17 Apr 2020 07:07:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729468AbgDQLHa (ORCPT ); Fri, 17 Apr 2020 07:07:30 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFAC5C061A0C; Fri, 17 Apr 2020 04:07:29 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id k18so851192pll.6; Fri, 17 Apr 2020 04:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qNf9by9mVcx85HZ3Z+9xf1bxw2bCzaI4yFqKMgY25eU=; b=vECTsvEYtCiUnyh0jrR2BP47JKSMnXSneOq8aE+ziAeoBultIAJ9SDL6puyx2jvJiV NUzONw91rE2WxcTpdbJqDEosmKReV2pO7jDNw+nN10Xqn6mLqkiqist5rs6+Z6PXJ//E IriYo9AoMojrVc9xERoXFm2dwlte/y1RVLiIp5e+JuAKVVBEWuPmYjvB0OTUHv9ICczo Lc2ryHpaeuNWqSW6O+In3y/kK920Y3z4M1ULJp2XOnCpCAkSbhZe7oHUIEmHnehITapW XTUcy9KiAXg+fjMKesbp1y6Oe8BXtAKobO3mJu55bQQ4p33NdVUIHhP2plp9R/rYwrlD h83A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qNf9by9mVcx85HZ3Z+9xf1bxw2bCzaI4yFqKMgY25eU=; b=rnPqG01RGnoqBWIAhWwfPgyedaHHhhJGSu5akoedQUvFObBZ10XE10o6hAMfJLfyCi 2IlzzocCG5aI2j7bCdZmh3IbDFZLGPnXCLwR37LYpU1Skg6B8mmYZOtknMdEG6eSiO0h hs+cZ7ExnlRxItK1BYnB2dTreS1v7u+90VNeh5Qih+cIcb9yWm1ZHDsCpjKUGsgxSzZI 9ydedhufc+odD6qO84cRC0ps0xgVYBjZ4GPJymiO1EFiNfkM+gXTaT8HIcms0ryMZDKy RR32KrsQHBkOcuqW1VN21pLT2WV3CTZK34tbIaWf4uv+T2i2Vsdk+B0Z3WVB9l7JJLmh ihBA== X-Gm-Message-State: AGi0PuagntJwmoloWsEdWEmefF+hUGlFkr41LqmlEYFBM3TE6MGV9pnU x8lJccRkBZFIudZR5AOpgS4= X-Received: by 2002:a17:902:8a88:: with SMTP id p8mr2953777plo.134.1587121649228; Fri, 17 Apr 2020 04:07:29 -0700 (PDT) Received: from MacBook-Pro.mshome.net ([122.224.153.228]) by smtp.googlemail.com with ESMTPSA id g3sm18011395pgd.64.2020.04.17.04.07.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Apr 2020 04:07:28 -0700 (PDT) From: Yanhu Cao To: jlayton@kernel.org Cc: sage@redhat.com, idryomov@gmail.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Yanhu Cao Subject: [v3] ceph: if we are blacklisted, __do_request returns directly Date: Fri, 17 Apr 2020 19:07:23 +0800 Message-Id: <20200417110723.12235-1-gmayyyha@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If we mount cephfs by the recover_session option, __do_request can return directly until the client automatically reconnects. Signed-off-by: Yanhu Cao --- fs/ceph/mds_client.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 486f91f9685b..16ac5e5f7f79 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2708,6 +2708,12 @@ static void __do_request(struct ceph_mds_client *mdsc, put_request_session(req); + if (mdsc->fsc->blacklisted && + ceph_test_mount_opt(mdsc->fsc, CLEANRECOVER)) { + err = -EBLACKLISTED; + goto finish; + } + mds = __choose_mds(mdsc, req, &random); if (mds < 0 || ceph_mdsmap_get_state(mdsc->mdsmap, mds) < CEPH_MDS_STATE_ACTIVE) { -- 2.24.2 (Apple Git-127)