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 B61B6143873; Wed, 19 Jun 2024 13:02:43 +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=1718802163; cv=none; b=lSxZJNGwp+0cLWhOfPKxnPkIRc+3sg9gH1V5+O0Gv064358fmJU+q4g/nOATErsJwgL5Z+05fUyq+0i1OtsnU0tjrta7Hnwfh0WJ5dRFjMuYIVJKV0L5Q+GGwh/Ea0n1DNFP6AwtgD+m4zVVk+fQVo4CZI02U00Md8+5OGSAp6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802163; c=relaxed/simple; bh=WkVOuEnDKAW51Je0VkYkwn8AzA+CZkt3LisDwlTb2y4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a2x495Y8gaa6ezr4QSu1yAXeQoj0K1xwzrrmKJhF6w1WdbIdJsufxMAthRDzHPQS+mhINSOLS4e3+dA4l2ubxesXqF3zBhWiMfC3l2XKMd4ZxWS9pmm692WoUWJFczzgY4SrzODvhpZSJYa6Gc3+JnD01jZjO4CScPKe+X1PICo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FaGRsVaa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FaGRsVaa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B065C2BBFC; Wed, 19 Jun 2024 13:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718802163; bh=WkVOuEnDKAW51Je0VkYkwn8AzA+CZkt3LisDwlTb2y4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FaGRsVaanzUMVn2YcRVGUw8xOVDxa6D4rpvP3OD1AzL2mzQ753QvV6lRck3zhbhkj 8/IRNP7B15rgZe8zqjKbOjQa5gmXIRlLhUDCUujyfizBZo/EjJctl57A27z7wNybos t4ZqdRd4RWEWs+kRBnDyTls7Tuj1QyRtiBHiB1/o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Baokun Li , Jeff Layton , Jingbo Xu , Christian Brauner , Sasha Levin Subject: [PATCH 6.6 103/267] cachefiles: add output string to cachefiles_obj_[get|put]_ondemand_fd Date: Wed, 19 Jun 2024 14:54:14 +0200 Message-ID: <20240619125610.306760895@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619125606.345939659@linuxfoundation.org> References: <20240619125606.345939659@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Baokun Li [ Upstream commit cc5ac966f26193ab185cc43d64d9f1ae998ccb6e ] This lets us see the correct trace output. Fixes: c8383054506c ("cachefiles: notify the user daemon when looking up cookie") Signed-off-by: Baokun Li Link: https://lore.kernel.org/r/20240522114308.2402121-2-libaokun@huaweicloud.com Acked-by: Jeff Layton Reviewed-by: Jingbo Xu Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- include/trace/events/cachefiles.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/trace/events/cachefiles.h b/include/trace/events/cachefiles.h index cf4b98b9a9edc..e3213af847cdf 100644 --- a/include/trace/events/cachefiles.h +++ b/include/trace/events/cachefiles.h @@ -127,7 +127,9 @@ enum cachefiles_error_trace { EM(cachefiles_obj_see_lookup_cookie, "SEE lookup_cookie") \ EM(cachefiles_obj_see_lookup_failed, "SEE lookup_failed") \ EM(cachefiles_obj_see_withdraw_cookie, "SEE withdraw_cookie") \ - E_(cachefiles_obj_see_withdrawal, "SEE withdrawal") + EM(cachefiles_obj_see_withdrawal, "SEE withdrawal") \ + EM(cachefiles_obj_get_ondemand_fd, "GET ondemand_fd") \ + E_(cachefiles_obj_put_ondemand_fd, "PUT ondemand_fd") #define cachefiles_coherency_traces \ EM(cachefiles_coherency_check_aux, "BAD aux ") \ -- 2.43.0