From patchwork Tue Jul 28 11:12:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6883681 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BE71FC05AC for ; Tue, 28 Jul 2015 11:13:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0102920520 for ; Tue, 28 Jul 2015 11:13:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 249F520513 for ; Tue, 28 Jul 2015 11:13:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755482AbbG1LNB (ORCPT ); Tue, 28 Jul 2015 07:13:01 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34828 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932422AbbG1LM7 (ORCPT ); Tue, 28 Jul 2015 07:12:59 -0400 Received: by pabkd10 with SMTP id kd10so68502131pab.2 for ; Tue, 28 Jul 2015 04:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=nE/00v2czkCkme1ZtYx8IbCo0NQxm/evr26t3wSRTmg=; b=ybWPeHUatvSofIDpUsb163UcVutvHM8MLhkBgpt3GEfjcfred/S+7v/gW4CjC5wjqn c5Jdg6lWmaajfuv4Vv1REmC5Tn4lBe/BOq6T8hSl+9bChB68JbpM27hDyvk7BI4b22+l J+MsZCTdAFNh94/dbBf1CE6kU8KEKGatHEM4qP0un8BzrLjbPYdF9njhn7lPGjBTCkOT PwJhV3tXZiclTfVDc0V88olft60XwGbc6/Os4JFk56tDaEgNE3ZeO0r0u4QLwx+FXUan +snV3y3kJVlHG16zBeOZJrUsnbdHnkF20igSAefkAZ63og3EzCTwGVYJgNppeQfeP8KI VYgw== X-Received: by 10.66.119.105 with SMTP id kt9mr81088530pab.86.1438081978740; Tue, 28 Jul 2015 04:12:58 -0700 (PDT) Received: from [192.168.99.11] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id v4sm2431687pdg.79.2015.07.28.04.12.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2015 04:12:58 -0700 (PDT) Message-ID: <55B763AF.6080804@gmail.com> Date: Tue, 28 Jul 2015 19:12:47 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Trond Myklebust , "linux-nfs@vger.kernel.org" CC: Andy Adamson , kinglongmee@gmail.com Subject: [PATCH 1/5] NFS: Remove duplicate svc_xprt_put from nfs41_callback_up Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The xprt created by svc_create_xprt have be added to serv->sv_permsocks. So putting the xprt directly is useless. Otherwise, there is a more svc_xprt_put after the xprt be freed. Signed-off-by: Kinglong Mee --- fs/nfs/callback.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 682529c..6d27d72 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -162,10 +162,6 @@ nfs41_callback_up(struct svc_serv *serv) spin_lock_init(&serv->sv_cb_lock); init_waitqueue_head(&serv->sv_cb_waitq); rqstp = svc_prepare_thread(serv, &serv->sv_pools[0], NUMA_NO_NODE); - if (IS_ERR(rqstp)) { - svc_xprt_put(serv->sv_bc_xprt); - serv->sv_bc_xprt = NULL; - } dprintk("--> %s return %d\n", __func__, PTR_ERR_OR_ZERO(rqstp)); return rqstp; }