From patchwork Mon Dec 24 10:11:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ycnian@gmail.com X-Patchwork-Id: 1908501 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0D85A3FC66 for ; Mon, 24 Dec 2012 10:49:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751922Ab2LXKtk (ORCPT ); Mon, 24 Dec 2012 05:49:40 -0500 Received: from mail-pb0-f53.google.com ([209.85.160.53]:47553 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590Ab2LXKtj (ORCPT ); Mon, 24 Dec 2012 05:49:39 -0500 X-Greylist: delayed 1295 seconds by postgrey-1.27 at vger.kernel.org; Mon, 24 Dec 2012 05:49:39 EST Received: by mail-pb0-f53.google.com with SMTP id jt11so3909931pbb.26 for ; Mon, 24 Dec 2012 02:49:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=IQ4c+sRIMn5VpBItrfg6ypQkvgDutJq05zloCdDn2Kc=; b=MRBV0L//b3SgnexdiAQnlfbO2ALmWaq51UfHogqknaOqM0lZUIvBHjqRESXoKc3vmS X4BcJvx/PlIdxyvIC2AiEx2Y9cmhtvcWPSF3qh9RWYYE/Dj8r3FCa3HJMkl4ZKAYrWpk EpFzKBHJSt4x8CIr9H+vdy4YHZcspUudBbyFehd9r3fGl9q6vBqElzzSoKvodaY2MwjO mQZV8xtalqmoD2gkFhYMTK6TL6TL2pjXqnqMGQTJXE0RL8TpJxAJ0XyBcLCYbbhrqORQ 4DK8hIqC2eg9ZA4emxQ04Ik2C9AqqwyXRa2UtBOZW6eD9yJ8XUz+N1OLHxgl2rWsGfuo eTag== X-Received: by 10.68.226.71 with SMTP id rq7mr65671092pbc.60.1356344517783; Mon, 24 Dec 2012 02:21:57 -0800 (PST) Received: from localhost ([159.226.5.131]) by mx.google.com with ESMTPS id z5sm12618342pax.9.2012.12.24.02.21.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Dec 2012 02:21:57 -0800 (PST) From: ycnian@gmail.com To: bfields@fieldses.org Cc: linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, Yanchuan Nian Subject: [PATCH] nfsd: Don't unlock the state while it's not locked Date: Mon, 24 Dec 2012 18:11:45 +0800 Message-Id: <1356343905-11990-1-git-send-email-ycnian@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Yanchuan Nian In the procedure of CREATE_SESSION, the state is locked after alloc_conn_from_crses(). If the allocation fails, the function goes to "out_free_session", and then "out" where there is an unlock function. Signed-off-by: Yanchuan Nian --- fs/nfsd/nfs4state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 29924a0..cc41bf4 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1844,11 +1844,12 @@ nfsd4_create_session(struct svc_rqst *rqstp, /* cache solo and embedded create sessions under the state lock */ nfsd4_cache_create_session(cr_ses, cs_slot, status); -out: nfs4_unlock_state(); +out: dprintk("%s returns %d\n", __func__, ntohl(status)); return status; out_free_conn: + nfs4_unlock_state(); free_conn(conn); out_free_session: __free_session(new);