From patchwork Wed Oct 27 11:52:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 69344 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CD043B70DE for ; Wed, 27 Oct 2010 22:52:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761000Ab0J0LwT (ORCPT ); Wed, 27 Oct 2010 07:52:19 -0400 Received: from mail.pripojeni.net ([217.66.174.14]:45697 "EHLO smtp.pripojeni.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756063Ab0J0LwP (ORCPT ); Wed, 27 Oct 2010 07:52:15 -0400 Received: from localhost.localdomain ([217.66.174.142]) by smtp.pripojeni.net (Kerio Connect 7.1.1); Wed, 27 Oct 2010 13:52:07 +0200 From: Jiri Slaby To: bfields@fieldses.org Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jirislaby@gmail.com, Neil Brown , linux-nfs@vger.kernel.org Subject: [PATCH] NET: sunrpc, remove unneeded NULL tests Date: Wed, 27 Oct 2010 13:52:05 +0200 Message-Id: <1288180325-20009-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.7.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stanse found that req in xprt_reserve_xprt is dereferenced prior its test to NULL. If that's the case, the checks are unnecessary, so remove them. The alternative is not to dereference it before the test. The patch is to point out the problem, you have to decide. Signed-off-by: Jiri Slaby Cc: "J. Bruce Fields" Cc: Neil Brown Cc: linux-nfs@vger.kernel.org --- net/sunrpc/xprt.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 4c8f18a..5355c71 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -202,10 +202,8 @@ int xprt_reserve_xprt(struct rpc_task *task) goto out_sleep; } xprt->snd_task = task; - if (req) { - req->rq_bytes_sent = 0; - req->rq_ntrans++; - } + req->rq_bytes_sent = 0; + req->rq_ntrans++; return 1; out_sleep: @@ -213,7 +211,7 @@ out_sleep: task->tk_pid, xprt); task->tk_timeout = 0; task->tk_status = -EAGAIN; - if (req && req->rq_ntrans) + if (req->rq_ntrans) rpc_sleep_on(&xprt->resend, task, NULL); else rpc_sleep_on(&xprt->sending, task, NULL);