fscache: Introduce fscache_cookie_is_dropped()
PATCH 1/1 fscache: Introduce fscache_cookie_is_dropped()
FSCACHE_COOKIE_STATE_DROPPED will be read more than once, so let's add a helper to avoid code duplication.
Signed-off-by Yue Hu <[email protected]>
--- fs/fscache/cookie.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
fs/fscache/cookie.c +8 -3
@@ -372,17 +372,22 @@ static struct fscache_cookie *fscache_alloc_cookie(return NULL ; } +static inline bool fscache_cookie_is_dropped (struct fscache_cookie *cookie) +{ +return READ_ONCE (cookie->state) ==FSCACHE_COOKIE_STATE_DROPPED ; +} +static void fscache_wait_on_collision (struct fscache_cookie *candidate,struct fscache_cookie *wait_for) {enum fscache_cookie_state *statep = &wait_for->state; -wait_var_event_timeout (statep,READ_ONCE (*statep) ==FSCACHE_COOKIE_STATE_DROPPED , +wait_var_event_timeout (statep,fscache_cookie_is_dropped (wait_for),20 *HZ ); -if (READ_ONCE (*statep) !=FSCACHE_COOKIE_STATE_DROPPED ) { +if (!fscache_cookie_is_dropped (wait_for)) {pr_notice ("Potential collision c=%08x old: c=%08x" , candidate->debug_id, wait_for->debug_id); -wait_var_event (statep,READ_ONCE (*statep) ==FSCACHE_COOKIE_STATE_DROPPED ); +wait_var_event (statep,fscache_cookie_is_dropped (wait_for)); } }
Signature · 1 line
2.17.1