From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9FA118A924; Sun, 26 Jan 2025 15:09:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737904168; cv=none; b=aprHrmTXS3MxsnND9T199AWnVgWhAX6eE21A9+QVn4fKe/E3Wrx3XJQAreWPJLLeNkaHuXeXF7x7Zd/HTgc0BhugIV3SI+S97k+SudsTd9oz2Ty0r1M3UZwT9d594+ldhDGGwV+bold3OktO9RDk8wKfN3NMVVrpFgk4c9U19BI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737904168; c=relaxed/simple; bh=qwCrlpBZb+ssNcQFYQepigLDu75J4MYFyMeMGCDgcRY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Sb5BufRnay9yS94L4rZPphFFI8FoYcUm67GGzw4L1ymxaC3ADZkXRLl7oSDs8l0oB3G+d8PhsvWEwlTXOhahNPhIKW0M/X1LX1i+zH27yoy2l8tnROmqN7VHaONcu+ripIU/RsfRxbzbC74Hd0yDzAfiMjG5vpa8MB4/8N0wLSw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IJjwryvl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IJjwryvl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ED60C4CED3; Sun, 26 Jan 2025 15:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737904168; bh=qwCrlpBZb+ssNcQFYQepigLDu75J4MYFyMeMGCDgcRY=; h=From:To:Cc:Subject:Date:From; b=IJjwryvla+hbVZCS6BQLod3mpImGGvum1lvPVvDNegOO7b7hgJSD/9CHSrAzg8vmP /Ag8P4eXyQeUBLcjlQpCsMcRzDxb6TJA9CIxBo+hpHb3cXjKf3nS5MvLP+omGvRb0N 8br/3pgKVHsnJ+EXuLskraYJzA5UGyaQiu8eAHme8ujaWe5c6iaO4xX+I7zxSys0zG 6MfQ/KeVJphuxjS4HEaXTUyYshwj316M3fVGgJ+fFkdSo1LvkMGFEDOOe73HXT+XJn Yyx9qREBu0WP67sYQkb4W2R0IoNDn3rbtp8VRWKnBd2w22pxPkNR+8HbfPv5A1Isxt jIVUth/d0lkfA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ian Rogers , Namhyung Kim , Arnaldo Carvalho de Melo , Adrian Hunter , Alexander Shishkin , Andi Kleen , Athira Rajeev , Ben Gainey , Colin Ian King , Dominique Martinet , Ilkka Koskinen , Ingo Molnar , James Clark , Jiri Olsa , Kan Liang , Mark Rutland , Oliver Upton , Paran Lee , Peter Zijlstra , "Steinar H . Gunderson" , Steven Rostedt , Thomas Falcon , Weilin Wang , Yang Jihong , Yang Li , Ze Gao , Zixian Cai , zhaimingbing , Sasha Levin Subject: [PATCH AUTOSEL 5.15 1/3] tool api fs: Correctly encode errno for read/write open failures Date: Sun, 26 Jan 2025 10:09:20 -0500 Message-Id: <20250126150923.962963-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.177 Content-Transfer-Encoding: 8bit From: Ian Rogers [ Upstream commit 05be17eed774aaf56f6b1e12714325ca3a266c04 ] Switch from returning -1 to -errno so that callers can determine types of failure. Reviewed-by: Namhyung Kim Signed-off-by: Ian Rogers Acked-by: Arnaldo Carvalho de Melo Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Athira Rajeev Cc: Ben Gainey Cc: Colin Ian King Cc: Dominique Martinet Cc: Ilkka Koskinen Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Oliver Upton Cc: Paran Lee Cc: Peter Zijlstra Cc: Steinar H. Gunderson Cc: Steven Rostedt (VMware) Cc: Thomas Falcon Cc: Weilin Wang Cc: Yang Jihong Cc: Yang Li Cc: Ze Gao Cc: Zixian Cai Cc: zhaimingbing Link: https://lore.kernel.org/r/20241118225345.889810-3-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/lib/api/fs/fs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c index 82f53d81a7a78..a0a6a907315f0 100644 --- a/tools/lib/api/fs/fs.c +++ b/tools/lib/api/fs/fs.c @@ -323,7 +323,7 @@ int filename__read_int(const char *filename, int *value) int fd = open(filename, O_RDONLY), err = -1; if (fd < 0) - return -1; + return -errno; if (read(fd, line, sizeof(line)) > 0) { *value = atoi(line); @@ -341,7 +341,7 @@ static int filename__read_ull_base(const char *filename, int fd = open(filename, O_RDONLY), err = -1; if (fd < 0) - return -1; + return -errno; if (read(fd, line, sizeof(line)) > 0) { *value = strtoull(line, NULL, base); @@ -428,7 +428,7 @@ int filename__write_int(const char *filename, int value) char buf[64]; if (fd < 0) - return err; + return -errno; sprintf(buf, "%d", value); if (write(fd, buf, sizeof(buf)) == sizeof(buf)) -- 2.39.5