From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH zfsonlinux 2/2] /lib/zfs-linux/trim: don't exit 1 if last pool isn't nvme-only (Closes: #1030316)
Date: Tue, 13 Jun 2023 11:57:53 +0200 [thread overview]
Message-ID: <20230613095753.514016-3-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20230613095753.514016-1-s.ivanov@proxmox.com>
(cherry picked from debian-upstream[0]
commit 8ed69adac193f6463832f6ae34b5ded88b8014d8)
[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim b/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim
index 341a2fbb..a807ecc5 100755
--- a/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim
+++ b/debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim
@@ -60,7 +60,7 @@ do
case "${ret}" in
disable);;
enable) trim_if_not_already_trimming "${pool}" ;;
- -|auto) pool_is_nvme_only "${pool}" && trim_if_not_already_trimming "${pool}" ;;
+ -|auto) if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;;
*) cat > /dev/stderr <<EOF
$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
--
2.30.2
next prev parent reply other threads:[~2023-06-13 9:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 9:57 [pve-devel] [PATCH zfsonlinux 0/2] update to 2.1.12 Stoiko Ivanov
2023-06-13 9:57 ` [pve-devel] [PATCH zfsonlinux 1/2] update zfs submodule " Stoiko Ivanov
2023-06-13 9:57 ` Stoiko Ivanov [this message]
2023-06-13 14:48 ` [pve-devel] applied-series: [PATCH zfsonlinux 0/2] update " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230613095753.514016-3-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.