From patchwork Thu Aug 2 04:18:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 952561 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41gxkB2zW1z9s2g; Thu, 2 Aug 2018 14:18:26 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fl548-0007AL-R8; Thu, 02 Aug 2018 04:18:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fl547-00079v-C8 for kernel-team@lists.canonical.com; Thu, 02 Aug 2018 04:18:19 +0000 Received: from mail-pf1-f199.google.com ([209.85.210.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fl547-0001tv-0M for kernel-team@lists.canonical.com; Thu, 02 Aug 2018 04:18:19 +0000 Received: by mail-pf1-f199.google.com with SMTP id v9-v6so659329pfn.6 for ; Wed, 01 Aug 2018 21:18:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=wZxteVjxHk4KevJ9hm1yuij9jZ1ZrHfSwLen828SWoU=; b=FWaAJD85+9mZ3iUWh+6uH+jjEQdiBGvKojoXwRgfGGSw5fMVmNMiX+UWlOL5Q3Kekv PI1rSkz0lmlhXDNaPN5NOzA+HRBYG0nkzGmz2Mtb9NSA2Pqn4ZUlKvSIZEHrYvybFW/6 vSZuog/r2Bh7gvgetF0SanOVIF2TSM1qfi4ClYZS87+PQ51XwgMS7eKBh/8P7tYdJJXP qud15C15dmijBmeUGUHa9+/qfoJ80JQBrVdbxPWgulOcsd4hhij18s4IQXNApeDYZS41 bwElyB5fmiulFR40Zo77IZoACelKc3s2bXY2ewagz09aDEpfxhIiwzimd8MxUYYM4LgF 8qiw== X-Gm-Message-State: AOUpUlEtEuFqBKoYy5welnohXMSFAsyiVBro3Rr43W69t1Ix/TIkNTl8 l1RjWB8OIWlINdpjQLqSmZTaqU2AkQhvvxQsCiUEhZu2ldSET57pbDft3AHvCkN8CZxTpKSJ5dW D76GVhe/tfLL1teMCCcpxqpY2kc/xUQaPZnxhfAHLuU2jpfji X-Received: by 2002:a65:6551:: with SMTP id a17-v6mr1112260pgw.132.1533183497719; Wed, 01 Aug 2018 21:18:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdRTy2UhQVlP36bO4zTo32J08NkKtiWdUgRgM9ywXda1ricAZ3HahCpXzL9LpclWestzWIenA== X-Received: by 2002:a65:6551:: with SMTP id a17-v6mr1112255pgw.132.1533183497601; Wed, 01 Aug 2018 21:18:17 -0700 (PDT) Received: from localhost.localdomain (124-171-193-200.dyn.iinet.net.au. [124.171.193.200]) by smtp.gmail.com with ESMTPSA id t186-v6sm639186pgd.77.2018.08.01.21.18.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 21:18:16 -0700 (PDT) From: Daniel Axtens To: kernel-team@lists.canonical.com Subject: [SRU X][PATCH 1/6] Revert "UBUNTU: SAUCE: CacheFiles: fix a read_waiter/read_copier race" Date: Thu, 2 Aug 2018 14:18:05 +1000 Message-Id: <20180802041810.22748-2-daniel.axtens@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180802041810.22748-1-daniel.axtens@canonical.com> References: <20180802041810.22748-1-daniel.axtens@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1774336 Revert 9bd2e21fbe3786e23ce8a23d3e51f1e04f1f7800 in Xenial. Upstream has taken a different solution, which we're about to apply. Signed-off-by: Daniel Axtens --- fs/cachefiles/rdwr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c index d9bb47d1e16d..c0f3da3926a0 100644 --- a/fs/cachefiles/rdwr.c +++ b/fs/cachefiles/rdwr.c @@ -58,9 +58,9 @@ static int cachefiles_read_waiter(wait_queue_t *wait, unsigned mode, spin_lock(&object->work_lock); list_add_tail(&monitor->op_link, &monitor->op->to_do); - fscache_enqueue_retrieval(monitor->op); spin_unlock(&object->work_lock); + fscache_enqueue_retrieval(monitor->op); return 0; }