From patchwork Thu Dec 9 20:04:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 395932 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB9K7rQa012909 for ; Thu, 9 Dec 2010 20:07:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757199Ab0LIUGa (ORCPT ); Thu, 9 Dec 2010 15:06:30 -0500 Received: from mail.perches.com ([173.55.12.10]:2426 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757080Ab0LIUEP (ORCPT ); Thu, 9 Dec 2010 15:04:15 -0500 Received: from localhost.home (unknown [192.168.1.153]) by mail.perches.com (Postfix) with ESMTP id 67BBB24371; Thu, 9 Dec 2010 12:04:03 -0800 (PST) From: Joe Perches To: Trond Myklebust Cc: Jiri Kosina , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/15] nfs: Remove duplicate unlikely from IS_ERR Date: Thu, 9 Dec 2010 12:04:06 -0800 Message-Id: X-Mailer: git-send-email 1.7.3.3.464.gf80b6 In-Reply-To: <1291906801-1389-2-git-send-email-tklauser@distanz.ch> References: <1291906801-1389-2-git-send-email-tklauser@distanz.ch> In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Dec 2010 20:07:53 +0000 (UTC) diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c index eceafe7..3f2a6be 100644 --- a/fs/nfs/mount_clnt.c +++ b/fs/nfs/mount_clnt.c @@ -248,7 +248,7 @@ void nfs_umount(const struct nfs_mount_request *info) args.flags |= RPC_CLNT_CREATE_NONPRIVPORT; clnt = rpc_create(&args); - if (unlikely(IS_ERR(clnt))) + if (IS_ERR(clnt)) goto out_clnt_err; dprintk("NFS: sending UMNT request for %s:%s\n",