From patchwork Sat May 11 02:44:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2553151 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 DD430DF2A2 for ; Sat, 11 May 2013 02:44:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757145Ab3EKCoO (ORCPT ); Fri, 10 May 2013 22:44:14 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:63204 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757088Ab3EKCoN (ORCPT ); Fri, 10 May 2013 22:44:13 -0400 Received: by mail-wg0-f45.google.com with SMTP id l18so4809842wgh.24 for ; Fri, 10 May 2013 19:44:12 -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=S6sfke3e3j27AiiW3Ut8G7rLEXLLU9jtZbGfuEmpp9k=; b=fCwdA0E5vK2uvZqteB0KNUafV/1U+qf6JD6JveQHoRVrXm9XsGAF0eKWFpktDaEZ+B z7rgb6BxYWfd+IDeeJjOXls1TQz8KghGqs11TUO6ki+XkWH9P2XsggyPbeYn22o8gWJU /L84DtTH8BDLx+7Nx65FD9AdlsixvgSy5JH/C4Gbb6re6vhLxUQ8sCg9qTtmNd1JWrIu PwnGN8gCHWvr6taV4L5rD04+8sbbQc5NzkoolqzDZMGWd/JFyozRLNrYrR9gwvaEKzgG ESEgQcxegoLVjDRkdzO6OEghnLJYAc3gqYv3BvKD2VSXHlfirQrlns6X0GCHy/6U/y97 xPvg== X-Received: by 10.180.210.207 with SMTP id mw15mr7234197wic.10.1368240252483; Fri, 10 May 2013 19:44:12 -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 q13sm1342749wie.8.2013.05.10.19.44.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 19:44:12 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH 26/38] pnfsd: layout state: move initialization of ls_roc Date: Sat, 11 May 2013 05:44:07 +0300 Message-Id: <1368240247-525-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 initialize prior to enlisting on fi_lo_states Signed-off-by: Benny Halevy --- fs/nfsd/nfs4pnfsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4pnfsd.c b/fs/nfsd/nfs4pnfsd.c index 1b31432..6e0e9d1 100644 --- a/fs/nfsd/nfs4pnfsd.c +++ b/fs/nfsd/nfs4pnfsd.c @@ -132,10 +132,10 @@ struct sbid_tracker { kref_init(&new->ls_ref); nfsd4_init_stid(&new->ls_stid, clp, NFS4_LAYOUT_STID); INIT_LIST_HEAD(&new->ls_perfile); + new->ls_roc = false; spin_lock(&layout_lock); list_add(&new->ls_perfile, &fp->fi_lo_states); spin_unlock(&layout_lock); - new->ls_roc = false; return new; }