From owner-svn-src-head@freebsd.org Tue May 30 20:03:58 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D42F9BEB1FA; Tue, 30 May 2017 20:03:58 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-TO1-obe.outbound.protection.outlook.com (mail-eopbgr670056.outbound.protection.outlook.com [40.107.67.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "Microsoft IT SSL SHA2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 875337735B; Tue, 30 May 2017 20:03:56 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM (10.165.218.133) by YTXPR01MB0191.CANPRD01.PROD.OUTLOOK.COM (10.165.218.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Tue, 30 May 2017 20:03:54 +0000 Received: from YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM ([10.165.218.133]) by YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM ([10.165.218.133]) with mapi id 15.01.1124.016; Tue, 30 May 2017 20:03:54 +0000 From: Rick Macklem To: Konstantin Belousov , John Baldwin CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r318997 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/nfsclient kern sys Thread-Topic: svn commit: r318997 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/nfsclient kern sys Thread-Index: AQHS2WI0J0VJA24VSkmHe10YcdO3DKINHucAgAAtB/g= Date: Tue, 30 May 2017 20:03:54 +0000 Message-ID: References: <201705271700.v4RH0USD004310@repo.freebsd.org> <2187407.D9lHvpEUce@ralph.baldwin.cx>,<20170530171904.GL82323@kib.kiev.ua> In-Reply-To: <20170530171904.GL82323@kib.kiev.ua> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: freebsd.org; dkim=none (message not signed) header.d=none;freebsd.org; dmarc=none action=none header.from=uoguelph.ca; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; YTXPR01MB0191; 7:pUiQNLL09grRRVlm0Uvf2gsJYSV7ziUEDZ+QXCmJ0JrUFz+VfaXJXD5agkeiRmX4PQXs/VsDTY+6OdkLAFHuIaZ7HuufU+wTuCm25omCxqJ7Ay4D2wPRw7tZzDRwSOvdPOn/laW3vrDWS7i8JVhyzIqX859s4OaglpKIHVKEUOz5AY1aEXbv2UxL7Z+VukHEG+LxQx8F34aRlRkxsOj4Jomo7Bal2qQDseY77YCS3/kkoiojL0g8mfNSk6swAXccffx79UMiP+OgqZe0NpWN9VmdLA8bhoavnGKVQIPKKyY80lfsxP/P4hXkZ67dzDsAjtnW2q2pYvr+wkloV6TfyA== x-ms-traffictypediagnostic: YTXPR01MB0191: x-ms-office365-filtering-correlation-id: 7028968d-252b-4588-a95b-08d4a797001d x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:YTXPR01MB0191; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(6041248)(20161123564025)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281529075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148); SRVR:YTXPR01MB0191; BCL:0; PCL:0; RULEID:; SRVR:YTXPR01MB0191; x-forefront-prvs: 032334F434 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39840400002)(39450400003)(39400400002)(39410400002)(39850400002)(24454002)(102836003)(122556002)(74482002)(38730400002)(50986999)(305945005)(54356999)(2900100001)(8676002)(478600001)(81166006)(5660300001)(74316002)(14454004)(6246003)(76176999)(77096006)(68736007)(8936002)(53936002)(229853002)(6436002)(6506006)(39060400002)(33656002)(189998001)(4326008)(2950100002)(9686003)(25786009)(86362001)(3660700001)(3280700002)(7696004)(575784001)(2906002)(55016002)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:YTXPR01MB0191; H:YTXPR01MB0189.CANPRD01.PROD.OUTLOOK.COM; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-originalarrivaltime: 30 May 2017 20:03:54.8520 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-Transport-CrossTenantHeadersStamped: YTXPR01MB0191 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2017 20:03:58 -0000 Konstantin Belousov wrote: >Thank you. >Indeed, the asignment should have been removed. Below is the proposed >correction. > >diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c >index 509c38b8614..44c0eae0179 100644 >--- a/sys/fs/nfsclient/nfs_clport.c >+++ b/sys/fs/nfsclient/nfs_clport.c >@@ -491,8 +491,7 @@ nfscl_loadattrcache(struct vnode **vpp, struct nfsvatt= r *nap, void > *nvaper, > * in the mounted subtree. > */ > vn_fsid(vp, vap); > - vap->va_fsid =3D np->n_vattr.na_filesid[0]; > - if (vap->va_fsid =3D=3D np->n_vattr.na_filesid[0]) > + if ((uint32_t)vap->va_fsid =3D=3D np->n_vattr.na_filesid[= 0]) > vap->va_fsid =3D hash32_buf( > np->n_vattr.na_filesid, 2 * sizeof(uint64_t), = 0); > } else Yep. Yhis revised one looks fine to me, rick