提交 daef5795 编写于 作者: G Gabriel Krisman Bertazi 提交者: Zheng Zengkai

watch_queue: Drop references to /dev/watch_queue

stable inclusion
from stable-5.10.20
commit 6e223a3d906a09863d1db331c8637f2d7385f33f
bugzilla: 50608

--------------------------------

[ Upstream commit 8fe62e0c ]

The merged API doesn't use a watch_queue device, but instead relies on
pipes, so let the documentation reflect that.

Fixes: f7e47677 ("watch_queue: Add a key/keyring notification facility")
Signed-off-by: NGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: NDavid Howells <dhowells@redhat.com>
Acked-by: NJarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: NBen Boeckel <mathstuf@gmail.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 158d1bd5
...@@ -1040,8 +1040,8 @@ The keyctl syscall functions are: ...@@ -1040,8 +1040,8 @@ The keyctl syscall functions are:
"key" is the ID of the key to be watched. "key" is the ID of the key to be watched.
"queue_fd" is a file descriptor referring to an open "/dev/watch_queue" "queue_fd" is a file descriptor referring to an open pipe which
which manages the buffer into which notifications will be delivered. manages the buffer into which notifications will be delivered.
"filter" is either NULL to remove a watch or a filter specification to "filter" is either NULL to remove a watch or a filter specification to
indicate what events are required from the key. indicate what events are required from the key.
......
...@@ -210,7 +210,7 @@ config SAMPLE_WATCHDOG ...@@ -210,7 +210,7 @@ config SAMPLE_WATCHDOG
depends on CC_CAN_LINK depends on CC_CAN_LINK
config SAMPLE_WATCH_QUEUE config SAMPLE_WATCH_QUEUE
bool "Build example /dev/watch_queue notification consumer" bool "Build example watch_queue notification API consumer"
depends on CC_CAN_LINK && HEADERS_INSTALL depends on CC_CAN_LINK && HEADERS_INSTALL
help help
Build example userspace program to use the new mount_notify(), Build example userspace program to use the new mount_notify(),
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Use /dev/watch_queue to watch for notifications. /* Use watch_queue API to watch for notifications.
* *
* Copyright (C) 2020 Red Hat, Inc. All Rights Reserved. * Copyright (C) 2020 Red Hat, Inc. All Rights Reserved.
* Written by David Howells (dhowells@redhat.com) * Written by David Howells (dhowells@redhat.com)
......
...@@ -119,7 +119,7 @@ config KEY_NOTIFICATIONS ...@@ -119,7 +119,7 @@ config KEY_NOTIFICATIONS
bool "Provide key/keyring change notifications" bool "Provide key/keyring change notifications"
depends on KEYS && WATCH_QUEUE depends on KEYS && WATCH_QUEUE
help help
This option provides support for getting change notifications on keys This option provides support for getting change notifications
and keyrings on which the caller has View permission. This makes use on keys and keyrings on which the caller has View permission.
of the /dev/watch_queue misc device to handle the notification This makes use of pipes to handle the notification buffer and
buffer and provides KEYCTL_WATCH_KEY to enable/disable watches. provides KEYCTL_WATCH_KEY to enable/disable watches.
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册