From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFB75C761A6 for ; Thu, 6 Apr 2023 02:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234867AbjDFCoI (ORCPT ); Wed, 5 Apr 2023 22:44:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234958AbjDFCoE (ORCPT ); Wed, 5 Apr 2023 22:44:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB03A768F for ; Wed, 5 Apr 2023 19:44:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 53F7B64217 for ; Thu, 6 Apr 2023 02:44:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACCC8C433D2; Thu, 6 Apr 2023 02:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1680749041; bh=ZsPL3sTGgSY1EjvhXYsuWx5MyE26I7xmhxxDj7gfuJ4=; h=Date:To:From:Subject:From; b=EkuYm5ZSTqd7+JNMtK1Eb4Q2n+cXYqJIYOhKNrYE1lcLqiNFjn63ZdORKORD1bj4t /V9qdaAU8Jg6vNCLMnJAGsfBIMhHYhymlrYc3+M8AIrIl2GQeG518noKcdyMCRzShM lWEvADFBF7QuPVc+wYVArPybobPX/nF8WN48yDE8= Date: Wed, 05 Apr 2023 19:44:01 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, kbusch@kernel.org, hch@lst.de, tonyb@cybernetics.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] dmapool-use-sysfs_emit-instead-of-scnprintf.patch removed from -mm tree Message-Id: <20230406024401.ACCC8C433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: dmapool: use sysfs_emit() instead of scnprintf() has been removed from the -mm tree. Its filename was dmapool-use-sysfs_emit-instead-of-scnprintf.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Tony Battersby Subject: dmapool: use sysfs_emit() instead of scnprintf() Date: Thu, 26 Jan 2023 13:51:16 -0800 Use sysfs_emit instead of scnprintf, snprintf or sprintf. Link: https://lkml.kernel.org/r/20230126215125.4069751-4-kbusch@meta.com Signed-off-by: Tony Battersby Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- mm/dmapool.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) --- a/mm/dmapool.c~dmapool-use-sysfs_emit-instead-of-scnprintf +++ a/mm/dmapool.c @@ -64,18 +64,11 @@ static DEFINE_MUTEX(pools_reg_lock); static ssize_t pools_show(struct device *dev, struct device_attribute *attr, char *buf) { - unsigned temp; - unsigned size; - char *next; + int size; struct dma_page *page; struct dma_pool *pool; - next = buf; - size = PAGE_SIZE; - - temp = scnprintf(next, size, "poolinfo - 0.1\n"); - size -= temp; - next += temp; + size = sysfs_emit(buf, "poolinfo - 0.1\n"); mutex_lock(&pools_lock); list_for_each_entry(pool, &dev->dma_pools, pools) { @@ -90,16 +83,14 @@ static ssize_t pools_show(struct device spin_unlock_irq(&pool->lock); /* per-pool info, no real statistics yet */ - temp = scnprintf(next, size, "%-16s %4u %4zu %4zu %2u\n", - pool->name, blocks, - pages * (pool->allocation / pool->size), - pool->size, pages); - size -= temp; - next += temp; + size += sysfs_emit_at(buf, size, "%-16s %4u %4zu %4zu %2u\n", + pool->name, blocks, + pages * (pool->allocation / pool->size), + pool->size, pages); } mutex_unlock(&pools_lock); - return PAGE_SIZE - size; + return size; } static DEVICE_ATTR_RO(pools); _ Patches currently in -mm which might be from tonyb@cybernetics.com are