From nobody Sat Aug 27 23:00:03 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MFXGW5639z4bN50; Sat, 27 Aug 2022 23:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MFXGW4QhJz3GbZ; Sat, 27 Aug 2022 23:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661641203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WuX8fa19Z70JJAIDENaYGdQ6lFH8MluaGykiY3ub0yM=; b=ZMNfc93rbQ2FsMvUJWMd2vMKTpLHnkyndItuUihPB5TWTOE6cufBSd0TVnS0eXfJQnAdiO WTbGyiiN3akXWzqZCtCliXwPmxDeraKimANiamDNnda2rAqutbkQ8yuSjzLplE+sYkPgKK eiI6uSOm0lRsQ2FcS5qy8f7K1DUk/ZCwwen/W8ayWGDJd+IIguEgm/OpTL4In7uhjyqZ0Z qxVjjqYZqBL/kisncy3OTsC/Ah8bqM7UqN+l0oYjWERPZd8PhVsGqkvZyW94ToM8Py2BXm lSxVgtHdhMheIQLohyuerx0eD+cmjkpIeWP5fFoYUlQQcLWr+UmBaRUy0YKWNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MFXGW3Vm1ztXC; Sat, 27 Aug 2022 23:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27RN03lZ077646; Sat, 27 Aug 2022 23:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27RN03PP077642; Sat, 27 Aug 2022 23:00:03 GMT (envelope-from git) Date: Sat, 27 Aug 2022 23:00:03 GMT Message-Id: <202208272300.27RN03PP077642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f2dfe607761c - main - Revert "nfscl: Fix handling of nd_slotid while handling NFSERR_BADSESSION" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2dfe607761c9b9dd78a336da20ce8d54c1e3cb6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661641203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WuX8fa19Z70JJAIDENaYGdQ6lFH8MluaGykiY3ub0yM=; b=oR87ms+r8eZsi0w2E3BVrM/NELQaWj6EU1iF4kGa3gyglpUUCW7US3bssATZasg7G+nKGO biyAwPUBWkgKlw2buHwVxXq1zeJjwMMIHV/yxU9+WFJH0mW3PBis6tSAIalxdKbS4RBT+N KlSCAjkX4Rvo0IOESG5/j4NvrZkz0GAMXtTk/X9HTe/fNN/FfQ5H9k/KEtNDi+xCovMZdd y54ryyRGuuSrwfz+o3622b5gH4ASDWHD8Xs3Tug23sPsaesW4frKChKoS4wUuB9ozcf4R2 zhAua7VTe02ALTm2MhnGMMtl0d55xtMb7m7Hg+EplbnTKqwJroFBoTbMRdmYGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661641203; a=rsa-sha256; cv=none; b=TvdapJztBy2SMqwbGRazGqvUPiYNGB4ZDkrhtMh95Sug/dWOi0EiesfqO7EX5DeHAzDgVZ 1G+KACT5b3Xtu1gSdPngFVOYYOMJwmQ3k+9y8d25ISg8OIj/aet2s+exjQ4V29q3K0Jc5M dwfW8FmxJdg9c2UBPrgoxF/DTjEruD5tTR2P9m1oO1Fv34T6uVBKXHdkrKgwtw2MmBH8m3 vDi60pk1NpR90IIJbjSy0p3rN4Z26Wtr+jBG4TxsjqwQVAj2l+NO6n7pb1oPEG/FwT2iD3 oCpZCpcDfmL1eC9TpGhvLzpfU3gUo4joh9ZWooynMBYfsEmMIUxI3s90Ku867g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f2dfe607761c9b9dd78a336da20ce8d54c1e3cb6 commit f2dfe607761c9b9dd78a336da20ce8d54c1e3cb6 Author: Rick Macklem AuthorDate: 2022-08-27 22:58:23 +0000 Commit: Rick Macklem CommitDate: 2022-08-27 22:58:23 +0000 Revert "nfscl: Fix handling of nd_slotid while handling NFSERR_BADSESSION" Revert this commit, since I now have a better fix to commit. This reverts commit 8e59ec29e47f6ec64f54ddd88cab388ae536f0ff. --- sys/fs/nfs/nfs_commonkrpc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index d630c6c69ede..916d0182d3ee 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1169,9 +1169,6 @@ tryagain: *tl++ = txdr_unsigned(slotseq); *tl++ = txdr_unsigned(slotpos); *tl = txdr_unsigned(maxslot); - if ((nd->nd_flag & - ND_HASSLOTID) != 0) - nd->nd_slotid = slotpos; } if (reterr == NFSERR_BADSESSION || reterr == 0) {