Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2171368imm; Mon, 28 May 2018 03:09:37 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ2dyZ3HveRXNwFUp7/vLTvkuSAr02JdCor9iNyQ/R1upAku6I4LrfEM1TGD7vBKaYaQUwW X-Received: by 2002:a62:c11:: with SMTP id u17-v6mr1457487pfi.60.1527502177013; Mon, 28 May 2018 03:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527502176; cv=none; d=google.com; s=arc-20160816; b=k61i455KqM6Cj3lmafA3g4+VqSbkd3+qCot+DfxDvolezk9FXXKyTt3o+ifucm6nkb FCe2Rr4TkRlW6jbNoB1QOoKOblvX7bzo8MMwSMPbvyAHqcgzpzIGpz1eczpHt0NoFhbM 0qGp7nJhEb3U1SSBRE2CHFS+KwQRtspZGxkKmNYXqDJaplOse5OHyFVUsAkk+zs3GWQz ZZE+9Xj2VEcrnvvXrd/gtUh0ceDLV+QPcL0hL+M7Mm8a1XmIAk0QC9+xOyRPImJv3Avl RJgYLiX/3zwSujC1iJ3GhLGrFSb6KffvCPNfETcFUzMxjSUjvXuovgVsUg7Ou0XLHss+ PhYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=v1zErSE8YaA7yJU3ciJGv7sl8fcY615JIve/mVMx0zU=; b=0Qgu9/qOoptBjn3Eu2nsXWH0/w2EDDQEt0iEGAoz6nnBdQXjIskgt0BHfqP7ucWRSJ 750BY3x+a8WN6gIvNLBaT/XnzZoHc6SybNH+yGnwuOj+Z6rb0Dx4kwAYPBy1+PRBgkJ7 FVk0R0Fku8WDGCHmB52OrEMb7WielhBcMlmLRdAFkxPmst+CwxA24Br/op2sQIH/FCnq oHVJ3YWw/GKqB0PfNgNR9OFlSD/m1ask4kpPkAImNRsbJ/99YeoDjRNMvKuInl9Y0RwB Z+mGR1IPnXjAHRwSkj6jpflvsrNMsR+rEQ/4RhOS01efcXXfWDejyBTdO7C5tIE2BqYO thLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yIgYva7x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o14-v6si22976458pgd.684.2018.05.28.03.09.22; Mon, 28 May 2018 03:09:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yIgYva7x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935036AbeE1KI7 (ORCPT + 99 others); Mon, 28 May 2018 06:08:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:57026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935006AbeE1KIy (ORCPT ); Mon, 28 May 2018 06:08:54 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8ACCA2086D; Mon, 28 May 2018 10:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527502134; bh=gy3uPdAmTL0ay1FQhuBDguyKQDj167rEXTv1/XS11xY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yIgYva7x7ZkXBXXXCtDp1AJrwdw+i1KRCVLlmWGxxZnJ+JuJXxJn7PME4cl4vtU4B jpiNjl3Fw44/JI+qKj+LUNzUsCHyzj93nj37acvKd8zJq2zI/wPp+sihEjp56aKOPc iQL2RrQ1tgdHcEOi06/+r8w9vfPDZ31tOmuHVnSw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tang Junhui , Michael Lyle , Jens Axboe , Sasha Levin Subject: [PATCH 3.18 044/185] bcache: return attach error when no cache set exist Date: Mon, 28 May 2018 12:01:25 +0200 Message-Id: <20180528100054.637671478@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100050.700971285@linuxfoundation.org> References: <20180528100050.700971285@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tang Junhui [ Upstream commit 7f4fc93d4713394ee8f1cd44c238e046e11b4f15 ] I attach a back-end device to a cache set, and the cache set is not registered yet, this back-end device did not attach successfully, and no error returned: [root]# echo 87859280-fec6-4bcc-20df7ca8f86b > /sys/block/sde/bcache/attach [root]# In sysfs_attach(), the return value "v" is initialized to "size" in the beginning, and if no cache set exist in bch_cache_sets, the "v" value would not change any more, and return to sysfs, sysfs regard it as success since the "size" is a positive number. This patch fixes this issue by assigning "v" with "-ENOENT" in the initialization. Signed-off-by: Tang Junhui Reviewed-by: Michael Lyle Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/md/bcache/sysfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/md/bcache/sysfs.c +++ b/drivers/md/bcache/sysfs.c @@ -191,7 +191,7 @@ STORE(__cached_dev) { struct cached_dev *dc = container_of(kobj, struct cached_dev, disk.kobj); - ssize_t v = size; + ssize_t v; struct cache_set *c; struct kobj_uevent_env *env; @@ -268,6 +268,7 @@ STORE(__cached_dev) if (bch_parse_uuid(buf, set_uuid) < 16) return -EINVAL; + v = -ENOENT; list_for_each_entry(c, &bch_cache_sets, list) { v = bch_cached_dev_attach(dc, c, set_uuid); if (!v) @@ -275,7 +276,7 @@ STORE(__cached_dev) } pr_err("Can't attach %s: cache set not found", buf); - size = v; + return v; } if (attr == &sysfs_detach && dc->disk.c)