From patchwork Tue Sep 2 14:11:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4826091 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1F79EC0338 for ; Tue, 2 Sep 2014 14:11:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0FAC9201B4 for ; Tue, 2 Sep 2014 14:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C70B82017E for ; Tue, 2 Sep 2014 14:11:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753855AbaIBOLo (ORCPT ); Tue, 2 Sep 2014 10:11:44 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:41395 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753707AbaIBOLn (ORCPT ); Tue, 2 Sep 2014 10:11:43 -0400 Received: by mail-pa0-f48.google.com with SMTP id ey11so14852528pad.35 for ; Tue, 02 Sep 2014 07:11:43 -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=n6rTweX3EPx5ZjCyvwUURMNUiMXO2pVPNY4O+I2VXSc=; b=o3PC1Ocm4+BIZ0dqW/KMqtXKVIcuOY8blpqspPAdjq0ms05j2CgBIsMvS35vkJmKN6 lsF2iGtxE7eiV/uuyxOYvqexcug+JcfhUxvNbfHQ8qYI2I4kyDCuQ7vkrlratlK54tMC vDFBt1yalfaD6HID4zNvEZc0JiEfXnm7j3TxliC86igefPs9v3ge6G2ysjgNs5njDa2f FWAxH3fpY9ay0TYuuMIIgx3i4Zmc3qgDHbiH2+KeHAPbUalD24niutIjvqxsew5fvwub mWUrWTNi12LBaws+ryMJKuAfbrBOMrRS5SnWL8fV65mBHhDJu6RMUb3bArW03qO6kwQN Yx9Q== X-Received: by 10.70.41.37 with SMTP id c5mr47535190pdl.75.1409667103170; Tue, 02 Sep 2014 07:11:43 -0700 (PDT) Received: from [192.168.0.100] ([171.92.20.104]) by mx.google.com with ESMTPSA id na4sm5589362pdb.96.2014.09.02.07.11.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 07:11:42 -0700 (PDT) Message-ID: <5405D00F.2040709@gmail.com> Date: Tue, 02 Sep 2014 22:11:27 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Linux NFS Mailing List , kinglong Mee Subject: [PATCH 2/6] NFSD: Reset creds after mnt_want_write_file() fail 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.5 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 Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4recover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 9c271f4..e37ac1c 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -188,7 +188,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp) status = mnt_want_write_file(nn->rec_file); if (status) - return; + goto out_creds; dir = nn->rec_file->f_path.dentry; /* lock the parent */ @@ -228,6 +228,7 @@ out_unlock: user_recovery_dirname); } mnt_drop_write_file(nn->rec_file); +out_creds: nfs4_reset_creds(original_cred); }