From patchwork Thu Dec 9 14:53:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Klauser X-Patchwork-Id: 394642 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 oB9F3MkT009563 for ; Thu, 9 Dec 2010 15:03:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754379Ab0LIPDV (ORCPT ); Thu, 9 Dec 2010 10:03:21 -0500 Received: from mx1.zhaw.ch ([160.85.104.50]:64184 "EHLO mx1.zhaw.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752235Ab0LIPDV (ORCPT ); Thu, 9 Dec 2010 10:03:21 -0500 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 15:03:22 +0000 (UTC) X-Greylist: delayed 591 seconds by postgrey-1.27 at vger.kernel.org; Thu, 09 Dec 2010 10:03:20 EST Received: from mx1.zhaw.ch (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 0396045C; Thu, 9 Dec 2010 15:50:28 +0100 (CET) Received: from localhost.localdomain (inst-232.223.zhaw.ch [160.85.232.223]) by mx1.zhaw.ch (Postfix) with ESMTP id 8C2AA3F9; Thu, 9 Dec 2010 15:50:27 +0100 (CET) From: Tobias Klauser To: Trond Myklebust , linux-nfs@vger.kernel.org Cc: kernel-janitors@vger.kernel.org Subject: [PATCH] NFS: Remove redundant unlikely() Date: Thu, 9 Dec 2010 15:53:28 +0100 Message-Id: <1291906408-859-1-git-send-email-tklauser@distanz.ch> X-Mailer: git-send-email 1.7.0.4 X-PMX-Version: 5.5.9.395186, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.12.9.144526 X-PerlMx-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_600_699 0, BODY_SIZE_7000_LESS 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org 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",