Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

untangling ep_call_nested(): take pushing cookie into a helper

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-08-22 23:05:44 -04:00
parent d01f0594d7
commit 3b1688efa0
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/eventpoll.c
View File

@ -424,6 +424,21 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi)
#endif /* CONFIG_NET_RX_BUSY_POLL */
static bool ep_push_nested(void *cookie)
{
int i;
if (nesting > EP_MAX_NESTS) /* too deep nesting */
return false;
for (i = 0; i < nesting; i++) {
if (cookies[i] == cookie) /* loop detected */
return false;
}
cookies[nesting++] = cookie;
return true;
}
/**
* ep_call_nested - Perform a bound (possibly) nested call, by checking
* that the recursion limit is not exceeded, and that
@ -440,17 +455,10 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi)
static int ep_call_nested(int (*nproc)(void *, void *, int), void *priv,
void *cookie)
{
int error, i;
int error;
if (nesting > EP_MAX_NESTS) /* too deep nesting */
if (!ep_push_nested(cookie))
return -1;
for (i = 0; i < nesting; i++) {
if (cookies[i] == cookie) /* loop detected */
return -1;
}
cookies[nesting++] = cookie;
/* Call the nested function */
error = (*nproc)(priv, cookie, nesting - 1);
nesting--;