From nobody Sun Oct 02 04:30:03 2022 X-Original-To: dev-commits-src-all@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 4Mg9x859Ylz4dtMn; Sun, 2 Oct 2022 04:30:04 +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 4Mg9x76x0Zz46Z8; Sun, 2 Oct 2022 04:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685004; 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=9WqwCVcHJeGQSSiknUKfdqcQC0rTsSE4dD6aIA8WirY=; b=lyBPBrYcftvnNbEwj8yknCNWKpuUY+KwoJELMU9wKcnM49Ms31fs9LV8Z8WfZjbkHnl4WG 4YMknvolZf34J9qd8GuZnSCIfA8q8fIZpvEA/EKlqYQsoxVT92d3qBZ0MuU1/hEQ/xtKpp 0qbBaXrrZ6buIhUQYnrM4+fM7NgBQeJs0B5vxYuQbB34Y7wChn1zTkuWVicywlB2yjsMtT NAAbDViwurcx4eGwXg3v1UR4zjsTXx965ICAdc8coIPHebSz/gD6R/3T4kjdkxIaXBpy/Z brRaK81WU3JZYWiTLxenb2zLAq6aUZK3Rz3rldSm8rDogc64/Cr6GT2FELI1eQ== 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 4Mg9x761GyzlTf; Sun, 2 Oct 2022 04:30: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 2924U3hW061063; Sun, 2 Oct 2022 04:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924U3OY061061; Sun, 2 Oct 2022 04:30:03 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:30:03 GMT Message-Id: <202210020430.2924U3OY061061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6bdaf5917f49 - stable/13 - ustorage_fs_verify: eliminate write only variables file_offset and file_offset List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6bdaf5917f493c3dd4e73ff507fb7d0537163444 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685004; 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=9WqwCVcHJeGQSSiknUKfdqcQC0rTsSE4dD6aIA8WirY=; b=v5qD717gm3r+upHlMAvocy6RBWoo3UVkEWDA9a2P7qmf8M06dMP+dFJFg62R1aVaP8zxtO KMmK96lV3nuD2f1oB13CzdcS1qbcPi1Xdu4xPawVXQa+ICbpo9lxYuOxdVxp0E7/78fMAd UPpq7exECFtqTRkZUTRncTSBzFEHhHLZ2ed9oXgUiiTKzIEFubjZQ5JViSNzpdL3BV+5ib LTiRGmdi1cbce//vNHrps4ua2vIKk167mI7m7jweQ+v9OOJ34FyCf3EnyNjZFOvajCNt5/ wehK5VaarAlfP7l/dCCO0WNtsHu1LDy4BkHHJAhGmD8Qn3e6xu7k3uUA6MoCDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664685004; a=rsa-sha256; cv=none; b=oLDxHZnyZ5gx8nJ/WLbn0xc7idbPRM0kleM5VjMEHNKXw4/fKB7oDN4TfSvaGTOXqcJHrt CUW++N7OYN9tvUKsaN2fhOXSHy5zyPR1Az9DhwkzdpZyYRF7GkfLIKu5QKtNXYoWjiBhNd 2kHtAqlp0QZ8RLx/xlxf4/AP9GsBYaIVzwYzDeRP1OqSiUNDsAAg5pTLPxcT0kp3JMSQhJ jokb/IclGW6K/Y39t/GosI09QhC9R2N8FmHd9bTHHdu+gsVIbMRv7A20aO6Qv7lL/xw1Nr lI96ocCvQ9tjV7V23gicXbgFSPIe4wwWDUtwGtQKZBAW7yI8H+ufGJCnYd/9QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6bdaf5917f493c3dd4e73ff507fb7d0537163444 commit 6bdaf5917f493c3dd4e73ff507fb7d0537163444 Author: Warner Losh AuthorDate: 2022-07-08 17:53:34 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:56 +0000 ustorage_fs_verify: eliminate write only variables file_offset and file_offset Sponsored by: Netflix (cherry picked from commit 7a1bef40f1e9bb4d3d56331e743dec79c49a8fc4) --- sys/dev/usb/storage/ustorage_fs.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/dev/usb/storage/ustorage_fs.c b/sys/dev/usb/storage/ustorage_fs.c index 8c9b35591018..adcb632bc93c 100644 --- a/sys/dev/usb/storage/ustorage_fs.c +++ b/sys/dev/usb/storage/ustorage_fs.c @@ -936,8 +936,6 @@ ustorage_fs_verify(struct ustorage_fs_softc *sc) struct ustorage_fs_lun *currlun = sc->sc_transfer.currlun; uint32_t lba; uint32_t vlen; - uint64_t file_offset; - uint64_t amount_left; /* * Get the starting Logical Block Address @@ -958,12 +956,6 @@ ustorage_fs_verify(struct ustorage_fs_softc *sc) } /* No default reply */ - /* Prepare to carry out the file verify */ - amount_left = vlen; - amount_left <<= 9; - file_offset = lba; - file_offset <<= 9; - /* Range check */ vlen += lba;