From nobody Mon Aug 7 14:24:17 2023 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 4RKJV96Yl8z4pj4S; Mon, 7 Aug 2023 14:24:17 +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 4RKJV961VMz4LFB; Mon, 7 Aug 2023 14:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418257; 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=mhVgjrJv9z6V+ABN0UhoWcaH0SqCwqmoTg7GPB7qrXg=; b=UpxpoVpMVLaw5zkdtQIMUAEpz+yY/78RLwX36B5v2obtu8tbTIogEC8VO2PqIWA/eHY8Ij NzzDocg0GGxnlOHjWprbR9ElBviIKuCQE6GO08b5U7oLOcq5jrK1MJw0gZDTbpSDnTuteJ GG5X5QpVxUaloc7axbCx0V/KNjj5wBkLSiE6KW29TAZPD7dHMbC7ufyJIxaH93O1L7ngp1 CCSiKBm1Zq0I+a8g/d+lyXChKcLHd2dJ6YxzaK/0n29O1Nn7B7121eQaOUTXXVJXHY4WPK PoFMRicfgzM6sixfyxSYpDpEjaOl39UHn0E290cUvYcFmz4NwuoeNPObaCaPtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418257; 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=mhVgjrJv9z6V+ABN0UhoWcaH0SqCwqmoTg7GPB7qrXg=; b=wCBnFOjud9p10qqpfn2Ox+BTbKj64KM6mzNsRLUrL9PqpRWHU42XNTqH/Ro5X2TbPsa4VL g/91jajYeB+KyrJDOPbf5W4CPPVtGKwTPXQTS3GjmcCa4eCHP+BDF1B9TsGA9yX6+R0XHd 88GLdvslHws523RnBm0NZRSdUYLdtE64XheR5xAE/AC2o9tyVjgmMURMalNqxQSswwR4NG AghPLjEInE+Yyb0MYzsKoRQfxJlbwAThW695y/mPR3i3i0kkFhI6a1OYtfQjunY0vBoeJg lKFDxXeUb6552icRb5F41L6uv0j+M0ezdFrB6LS+4P2yev/EDhQiMR+ubUeUXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418257; a=rsa-sha256; cv=none; b=eCUw2xBo8x48YH/pShRLRwCsuNz0GZd+HZUOOmrkhq6TnvbpsCyWwyeSiip2mgDM4fuYET i/xtQGvhsptXx0ZjvsiE1TBCiCls0Fy9TJKm/G8naam1qk32xP5gE7bmQNJcvQrVClqBV3 UFz0Ps4mOMQeWwoR4/QOIYDliiSsBoY7uR6s1CKqmKKbd7INeWcfhE2jxEfwMtopHHXgCp wmsOT3NnWH64BLQbj64RrcaDeddtdjmi0D2lw0LP1rfvPpO25ZPs+Ztkzhw4DbprZSWKV4 eOKxhQhoZ4SzNdYK7Cvh5HpDiiFGPqYAkZO2BmC/1nj3K4a8gHqrCtRBfW2Msg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKJV94lR0zwBY; Mon, 7 Aug 2023 14:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EOHSE025868; Mon, 7 Aug 2023 14:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOHGG025867; Mon, 7 Aug 2023 14:24:17 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:17 GMT Message-Id: <202308071424.377EOHGG025867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d41dfdb6f413 - stable/13 - linux(4): Delete a useless variable in getdents64 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d41dfdb6f413ab3acba2897c7c992fbbd271382e Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d41dfdb6f413ab3acba2897c7c992fbbd271382e commit d41dfdb6f413ab3acba2897c7c992fbbd271382e Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:58 +0000 linux(4): Delete a useless variable in getdents64 MFC after: 2 weeks (cherry picked from commit b27f3237c82bde866cb24f7299eaa356e8b29eb2) --- sys/compat/linux/linux_file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 249034231c36..da492ec4c4cb 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -526,7 +526,6 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) int len, reclen; /* BSD-format */ caddr_t outp; /* Linux-format */ int resid, linuxreclen; /* Linux-format */ - caddr_t lbuf; /* Linux-format */ off_t base; struct l_dirent64 *linux_dirent64; int buflen, error; @@ -542,7 +541,8 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) goto out1; } - lbuf = malloc(LINUX_RECLEN64(LINUX_NAME_MAX), M_TEMP, M_WAITOK | M_ZERO); + linux_dirent64 = malloc(LINUX_RECLEN64(LINUX_NAME_MAX), M_TEMP, + M_WAITOK | M_ZERO); len = td->td_retval[0]; inp = buf; @@ -563,7 +563,6 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) goto out; } - linux_dirent64 = (struct l_dirent64*)lbuf; linux_dirent64->d_ino = bdp->d_fileno; linux_dirent64->d_off = bdp->d_off; linux_dirent64->d_reclen = linuxreclen; @@ -585,7 +584,7 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) td->td_retval[0] = retval; out: - free(lbuf, M_TEMP); + free(linux_dirent64, M_TEMP); out1: free(buf, M_TEMP); return (error);