diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index 4bb81e003ae1329669513def111df6c29133519f..e26ebbc8980665956d3d1de158b85f19a68b19ad 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -370,6 +370,7 @@ static __poll_t cachefiles_daemon_poll(struct file *file,
 
 	if (cachefiles_in_ondemand_mode(cache)) {
 		if (!radix_tree_empty(&cache->reqs)) {
+			xa_lock(&cache->reqs);
 			radix_tree_for_each_tagged(slot, &cache->reqs, &iter, 0,
 					CACHEFILES_REQ_NEW) {
 				req = radix_tree_deref_slot_protected(slot,
@@ -379,6 +380,7 @@ static __poll_t cachefiles_daemon_poll(struct file *file,
 					break;
 				}
 			}
+			xa_unlock(&cache->reqs);
 		}
 	} else {
 		if (test_bit(CACHEFILES_STATE_CHANGED, &cache->flags))