From patchwork Wed Jan 29 17:36:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 3553081 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 3173AC02DC for ; Wed, 29 Jan 2014 17:36:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 53CB12017E for ; Wed, 29 Jan 2014 17:36:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86FB12018E for ; Wed, 29 Jan 2014 17:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752548AbaA2Rg2 (ORCPT ); Wed, 29 Jan 2014 12:36:28 -0500 Received: from mail-ie0-f180.google.com ([209.85.223.180]:34025 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbaA2Rg2 (ORCPT ); Wed, 29 Jan 2014 12:36:28 -0500 Received: by mail-ie0-f180.google.com with SMTP id at1so2288524iec.25 for ; Wed, 29 Jan 2014 09:36:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l2HFQEiSdCl63aX1d/wZdvBuHpflmI01Cwbzg1qqcbQ=; b=cD095G8GYvi6ExswWYF1WjwjBGdClaN8Kq5E55oSzQKcdfCZk4zDbCmIySdXWEo7J3 L0VOsRbmV+lquLwWmj5FLl3ab4ylxpqij6YOfEY8To8DFhgkQ4ltUETYclMVUYVPYZOJ ouiYAQHF14SHE1s//qe817HKF+DGxVO/7/Hu6x3N/JizUmaR5MPD1exuWIJr4lUSed03 td32OfgrWtqXFxMe+uEd7p8fOKqgSYj12OTW4h9Y1If7YGMhqnnLjMshGms3yioDGpkC rTpJXLzPm1Umz28fwq4SrH5JI1SXknYYiFr9fesYMTnsYeogtJ0syulOWetSrg92ZC1h 2z9A== X-Gm-Message-State: ALoCoQlLf80qB5gjUKcsP0Q2cIDjinYUO65JqHSDPEtNKYlbr7fc634zD1twYKOxhl+ygL9P2CWT X-Received: by 10.50.141.234 with SMTP id rr10mr30061839igb.11.1391016987850; Wed, 29 Jan 2014 09:36:27 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-98-209-19-95.hsd1.mi.comcast.net. [98.209.19.95]) by mx.google.com with ESMTPSA id x13sm43842595igp.2.2014.01.29.09.36.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2014 09:36:27 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Cc: Trond Myklebust Subject: [PATCH 3/3] NFSv4.1: Cleanup Date: Wed, 29 Jan 2014 12:36:22 -0500 Message-Id: <1391016982-10562-3-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391016982-10562-2-git-send-email-trond.myklebust@primarydata.com> References: <1391016982-10562-1-git-send-email-trond.myklebust@primarydata.com> <1391016982-10562-2-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 It is now completely safe to call nfs41_sequence_free_slot with a NULL slot. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4filelayout.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 20a56fa271bd..12c8132ad408 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -336,8 +336,7 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data) if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) && task->tk_status == 0) { - if (rdata->res.seq_res.sr_slot != NULL) - nfs41_sequence_done(task, &rdata->res.seq_res); + nfs41_sequence_done(task, &rdata->res.seq_res); return; } @@ -446,8 +445,7 @@ static void filelayout_write_call_done(struct rpc_task *task, void *data) if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) && task->tk_status == 0) { - if (wdata->res.seq_res.sr_slot != NULL) - nfs41_sequence_done(task, &wdata->res.seq_res); + nfs41_sequence_done(task, &wdata->res.seq_res); return; }