From nobody Fri Feb 18 14:52:24 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 B91FB19D70E8; Fri, 18 Feb 2022 14:52:24 +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 4K0ZRX3nqkz3Fct; Fri, 18 Feb 2022 14:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645195944; 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=N3lZP7e6W9iCyPNOwiB83HCM3oxIW5EhvxaxUJGPKIc=; b=K3aQzgwBYxvZT1x+YuF8lTuNVFnCdEz/tfE2J3Wn9ZI3os+39nkXf7u9QnjvweouuenEBb wDtdvI30Ok+pW4mUF8Gm7f+iO/yYfwKAq2xRfiTOUTaAnZic3FIyUb/Ge81GAT2vTFfzCJ nv+7v/oTRxF+zrBG5+GQfI1dSm2jEfPbE2Am1mCUEvEVdv3yad+7wpxNTn3Ei+DOzifpMo za1XEw6YcHy1sFDWDxKaJfMXOnNfztftBc2J6eB52whoRvUOjWi0XTOgAY4BOPnXZumZrS RqtWVHv2pNYzi4H/E9HRQm6th7yb/OeqKjCdrKcEBOa5NF+ygfezAqydeW5lfA== 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 588501F79D; Fri, 18 Feb 2022 14:52:24 +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 21IEqOlq077459; Fri, 18 Feb 2022 14:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IEqOSk077458; Fri, 18 Feb 2022 14:52:24 GMT (envelope-from git) Date: Fri, 18 Feb 2022 14:52:24 GMT Message-Id: <202202181452.21IEqOSk077458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 5b8c67766471 - stable/13 - sesutil: Fix status checking 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b8c67766471038040ffd9e89df969f859affdc5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645195944; 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=N3lZP7e6W9iCyPNOwiB83HCM3oxIW5EhvxaxUJGPKIc=; b=dYceun7xZN0ArKbyYYZFdC+AKPguGZ0y30ToFTC/fkkwMSJhsZzpE6R6NWxdPe1AMFXXhz xB2fWb91B57Hlx4zOItroe0uwaNsV2npbke9FHNqP2WRaVXPDIXYuc5IBe/IfzWHd/UQvv 2WWN3bQrNfAcDu0s/EnJ73nCa/KD95HdQCZTwXQt+XsAEBSByUp6zAMy926i119LXLwypt Wv2OBbvu7QObYOJy7ESNV80BuGu3mqOz8pohHR5dB55/yDR4o8wIgAm3gOHfvfTbJrcRkM cqW2/J7y2Omh3NQ1henmh4D077XLcTj3iV3ZKDtQjoa5+Qeck4uzixrU0uOxvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645195944; a=rsa-sha256; cv=none; b=h5maxqhhBVKaOV5ytSyY3ju6E6QJ6XQHaxJmQ4EOx3Ml7EMSpLRUBw2xJ9jIQfII9anFi6 D82kTX7k1jAsndWimuEqZeFE684LE6oHi+ehMhh8WzIVOGkcuY/1q4fMO3O2wvgMrp8RzA 4SuYSZ4NhuB7jtWZkPFIggtpv3sEpkk6jyWi+Q47ljxhtaZBzIjxpBENjawT/cFZP1+rmE WySM4WEYump9rclec38KLFfAl2OaDQdXM2lCvqnA3C4I7K52yMvI53beJKgAqblc2OnyGa K7vta6ZXzz18HcGFiEbd939c3i7mKRo39tojhzn0NIqwTeTzTXy04Xpb1fc1BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=5b8c67766471038040ffd9e89df969f859affdc5 commit 5b8c67766471038040ffd9e89df969f859affdc5 Author: Edward Tomasz Napierala AuthorDate: 2021-07-21 09:14:21 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-14 18:42:44 +0000 sesutil: Fix status checking Previously we would display "OK, Swapped" for swapped disks, instead of the usual disk size. Reviewed By: allanjude Differential Revision: https://reviews.freebsd.org/D31219 (cherry picked from commit a1571967135255d2ea5256a4721e6f9909f291e5) --- usr.sbin/sesutil/sesutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c index 0dd02021b374..33303235a33c 100644 --- a/usr.sbin/sesutil/sesutil.c +++ b/usr.sbin/sesutil/sesutil.c @@ -651,7 +651,7 @@ show_device(int fd, int elm_idx, encioc_elm_status_t e_status, encioc_elm_desc_t xo_emit("{e:model/%s}", model ? model : ""); xo_emit("{d:serial/%-20s} ", serial != NULL ? serial : "-"); xo_emit("{e:serial/%s}", serial != NULL ? serial : ""); - if (e_status.cstat[0] == SES_OBJSTAT_OK && size >= 0) { + if ((e_status.cstat[0] & 0xf) == SES_OBJSTAT_OK && size >= 0) { xo_emit("{h,hn-1000:size/%ld}{e:status/%s}", size, scode2ascii(e_status.cstat[0])); } else {