From patchwork Sun Dec 22 23:01:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 3394511 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 988349F169 for ; Sun, 22 Dec 2013 23:01:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D20AF205B7 for ; Sun, 22 Dec 2013 23:01:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8FBA205B5 for ; Sun, 22 Dec 2013 23:01:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755645Ab3LVXBb (ORCPT ); Sun, 22 Dec 2013 18:01:31 -0500 Received: from mail-ea0-f175.google.com ([209.85.215.175]:35925 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755438Ab3LVXBa (ORCPT ); Sun, 22 Dec 2013 18:01:30 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so2031717ead.20 for ; Sun, 22 Dec 2013 15:01:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ZC3sWNr3vf39itPrru9Evo376V98a1BV6nsooNH+alg=; b=AAYxRZID5RaSoUlNohNIDLE0/SvtkNmD5on7OUd7roXWzSZXXyTYslmDUrlg+au5I0 6l9RxEHBonY3EWWI+Z2Xq/4VCwchl1PrMl05Ic2YTUXunicWF+CA+4o2OqZEQ/CaQ8kE 4sCsyxRKUyj3qgirdea328X6nU5kL3jz1Gqdars9lzAAyKCnmPdzKX5k7j9bigxObEeN GrYSBGlu4TVSFqtuZ68n/M9nhzHP35JcyTT9LvBRJFUXNJMa6Yf1jAf1jlWKlntS1Fmg LNi3Sd3U6BMVmuc1NnwHK7rTbAV9kjYbJ3AXKaIEn71WDu/TIpEvHpUG7Th5x6dN6EF4 5TeQ== X-Received: by 10.14.199.1 with SMTP id w1mr17782267een.29.1387753289214; Sun, 22 Dec 2013 15:01:29 -0800 (PST) Received: from localhost.localdomain (p4FD33703.dip0.t-ipconnect.de. [79.211.55.3]) by mx.google.com with ESMTPSA id b41sm40315383eef.16.2013.12.22.15.01.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Dec 2013 15:01:28 -0800 (PST) From: Alexander Aring To: hannes@stressinduktion.org Cc: linux-nfs@vger.kernel.org, netdev@vger.kernel.org, stable@vger.kernel.org, werner@almesberger.net, Alexander Aring Subject: [PATCH v2] nfs: fix dead code of ipv6_addr_scope Date: Mon, 23 Dec 2013 00:01:16 +0100 Message-Id: <1387753276-27009-1-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 1.8.5.2 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.3 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 This patch corrects the check on a linklocal address. Currently this can't be work, because ipv6_addr_scope returns a int with a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL is 0x02. So the condition is always false. Signed-off-by: Alexander Aring Acked-by: Hannes Frederic Sowa --- - change check on linklocal address from (ipv6_addr_src_scope(&a6->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL) to (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL) which is a little bit faster. - change commit msg. fs/nfs/nfs4filelayoutdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c index c7c295e5..dc5e9e1 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c @@ -95,8 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2) b6 = (struct sockaddr_in6 *)addr2; /* LINKLOCAL addresses must have matching scope_id */ - if (ipv6_addr_scope(&a6->sin6_addr) == - IPV6_ADDR_SCOPE_LINKLOCAL && + if (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL && a6->sin6_scope_id != b6->sin6_scope_id) return false;