From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93584185F for ; Sat, 4 Jun 2022 19:31:30 +0000 (UTC) Received: by mail-qk1-f172.google.com with SMTP id k6so5324719qkf.4 for ; Sat, 04 Jun 2022 12:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HmYk1E0nlrVwRWwFSUC/a4yoPMG0X4XicsKq1hOz6KU=; b=PJoje00985N6oGb/Y7bGsu79gRdWGwWmNVnvrX06a4qBWEHiGWQMqbbjrBD0FWF2C9 hSxat3cFEp6yEukLVpR44SfZoxpFuoy8AW0TgKufz1DdZL5g4kNAzKJx0SPBApiG7uu9 5iJ5dC8D+KXHkXvGpc8je01NDyf1w/bitToUoQPbJleWS5Aihp4Z6oeD3doWmT251/Cp rh9gw83EVSkHrRClNO/OBunWbwOxu/mC3V+aooYZnVFQS+qMckTUvctDbOhw6s9TmWyO II1dLerx3Cqsh6cZ78WG0pNY2U19ON3i0qzCmNq4qNtFUNIlU8RatEylhTfDZWObcyZz JZvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HmYk1E0nlrVwRWwFSUC/a4yoPMG0X4XicsKq1hOz6KU=; b=zwkz8kFKE0LmRYi59NhTWsluFi6GByvrcc58YQNvCQZokirwIP6E3Uousa8gy3hPwY GdhngeIaVNsjrPheVCs5FwFkhEXf6szzCNGOdaG0NllC04vp1U2UKKB2idh8CefcCYlk Ve+oL3xu1hd6Fzrr5PVUfosmN5sELIzrLwWXWpkelzScPnX+Fp2duG0ydevdkjHt35Tq YGhbBiPaRae5ofDGzgHABcGE8BVibF2UoPU0wqVwOv8JLIS2yWFGssnAo575+WrCzpyq yoiP5/YA+R9zl5wonwA+CObsLQjqHVuVDA/BuSMfUVyoHqndPekiEiiizA9QqBayswii 1aiw== X-Gm-Message-State: AOAM531Asvxc1PGQQYQDiwfrb/AIZ1OSw+TBWxYv0YOSS/GtyAvmV9ng Lz7dc96yUfCyDN4VcNqZ4A== X-Google-Smtp-Source: ABdhPJx+3SHYROOTVTOhx/1YUWQwQKfJsM6CjtyyJSI2BNjTj2VGslnIUXruGHfNZ1OR/0E4gZ8QFQ== X-Received: by 2002:a05:620a:2586:b0:680:f846:4708 with SMTP id x6-20020a05620a258600b00680f8464708mr10998237qko.654.1654371089527; Sat, 04 Jun 2022 12:31:29 -0700 (PDT) Received: from moria.home.lan (c-73-219-103-14.hsd1.vt.comcast.net. [73.219.103.14]) by smtp.gmail.com with ESMTPSA id o17-20020ac84291000000b00304defdb1b3sm3537426qtl.85.2022.06.04.12.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 12:31:28 -0700 (PDT) From: Kent Overstreet To: linux-kernel@vger.kernel.org Cc: Kent Overstreet , pmladek@suse.com, rostedt@goodmis.org, Dan Williams , Dave Hansen , nvdimm@lists.linux.dev Subject: [PATCH v3 26/33] tools/testing/nvdimm: Convert to printbuf Date: Sat, 4 Jun 2022 15:30:35 -0400 Message-Id: <20220604193042.1674951-27-kent.overstreet@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220604193042.1674951-1-kent.overstreet@gmail.com> References: <20220604193042.1674951-1-kent.overstreet@gmail.com> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This converts from seq_buf to printbuf. Here we're using printbuf with an external buffer, meaning it's a direct conversion. Signed-off-by: Kent Overstreet Cc: Dan Williams Cc: Dave Hansen Cc: nvdimm@lists.linux.dev --- tools/testing/nvdimm/test/ndtest.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/testing/nvdimm/test/ndtest.c b/tools/testing/nvdimm/test/ndtest.c index 4d1a947367..a2097955da 100644 --- a/tools/testing/nvdimm/test/ndtest.c +++ b/tools/testing/nvdimm/test/ndtest.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "../watermark.h" #include "nfit_test.h" @@ -740,32 +740,30 @@ static ssize_t flags_show(struct device *dev, { struct nvdimm *nvdimm = to_nvdimm(dev); struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm); - struct seq_buf s; + struct printbuf s = PRINTBUF_EXTERN(buf, PAGE_SIZE); u64 flags; flags = dimm->flags; - seq_buf_init(&s, buf, PAGE_SIZE); if (flags & PAPR_PMEM_UNARMED_MASK) - seq_buf_printf(&s, "not_armed "); + prt_printf(&s, "not_armed "); if (flags & PAPR_PMEM_BAD_SHUTDOWN_MASK) - seq_buf_printf(&s, "flush_fail "); + prt_printf(&s, "flush_fail "); if (flags & PAPR_PMEM_BAD_RESTORE_MASK) - seq_buf_printf(&s, "restore_fail "); + prt_printf(&s, "restore_fail "); if (flags & PAPR_PMEM_SAVE_MASK) - seq_buf_printf(&s, "save_fail "); + prt_printf(&s, "save_fail "); if (flags & PAPR_PMEM_SMART_EVENT_MASK) - seq_buf_printf(&s, "smart_notify "); + prt_printf(&s, "smart_notify "); + if (printbuf_written(&s)) + prt_printf(&s, "\n"); - if (seq_buf_used(&s)) - seq_buf_printf(&s, "\n"); - - return seq_buf_used(&s); + return printbuf_written(&s); } static DEVICE_ATTR_RO(flags); -- 2.36.0