From patchwork Sat May 11 02:43:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2553111 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id BCE0ADF2A2 for ; Sat, 11 May 2013 02:43:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757076Ab3EKCn7 (ORCPT ); Fri, 10 May 2013 22:43:59 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:37269 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756416Ab3EKCn6 (ORCPT ); Fri, 10 May 2013 22:43:58 -0400 Received: by mail-wi0-f177.google.com with SMTP id hr14so1207898wib.10 for ; Fri, 10 May 2013 19:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=3ZkBjNv+vmQvByCnT/WouXMahsGd5cBPz62rw2MPCus=; b=MmcKg2LypR3F2nFs4Ovqe4hZoRZiIHvEWzHNdalhj7yEUgt+PF0VWPqeVYHST2R/qz PmLCplZE/X1RE4cTMzvWP1GybSPj6PELfFWMPl7id0eHGmfyWpCQlH2YkuB58UhLZxyT p9xc01cNBuDuiKXqF35q2f99yh6EH2QDEvS0Gliv9Z86ANEIiiUqJpRRM7+C57ALGRQM q4XE3D91JXSVk4GWt7mkEndeFI8BTWuATLUMyYnqLnQopnbLOZSpoqSecUAgq/jWmJT0 BQp8XAnn0gZ1CWvhmbFQHPAQsfvC5qm/2J+3KmeuP1TE0yAsjdc/tWkzUwRAcer9Lndb HO8Q== X-Received: by 10.195.12.228 with SMTP id et4mr28056032wjd.59.1368240237443; Fri, 10 May 2013 19:43:57 -0700 (PDT) Received: from bhalevy-lt.il.tonian.com (bzq-79-180-144-28.red.bezeqint.net. [79.180.144.28]) by mx.google.com with ESMTPSA id h8sm1332240wiz.9.2013.05.10.19.43.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 19:43:56 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH 22/38] SQUASHME: pnfsd: hanging nfs4_layoutrecall on the client's list must be under the layout_lock Date: Sat, 11 May 2013 05:43:52 +0300 Message-Id: <1368240232-32576-1-git-send-email-bhalevy@tonian.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <518B6377.3000207@tonian.com> References: <518B6377.3000207@tonian.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Benny Halevy --- fs/nfsd/nfs4pnfsd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfsd/nfs4pnfsd.c b/fs/nfsd/nfs4pnfsd.c index ff688cb..7c454d2 100644 --- a/fs/nfsd/nfs4pnfsd.c +++ b/fs/nfsd/nfs4pnfsd.c @@ -1416,8 +1416,10 @@ struct create_recall_list_arg { pending->parent = parent; get_layoutrecall(pending); /* Add to list so corresponding layoutreturn can find req */ + spin_lock(&layout_lock); list_add(&pending->clr_perclnt, &pending->clr_client->cl_layoutrecalls); + spin_unlock(&layout_lock); nfsd4_cb_layout(pending); --todo_len;