[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130403144857.22351.67546.stgit@rabbit.intern.cm-ag>
Date: Wed, 03 Apr 2013 16:48:57 +0200
From: Max Kellermann <mk@...all.com>
To: dhowells@...hat.com, linux-cachefs@...hat.com
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] fscache: extended "dying" check before emitting
EV_INVALIDATE
Before emitting an FSCACHE_OBJECT_EV_INVALIDATE event, the function
__fscache_invalidate() checks whether the fscache_object is currently
"dying". This checks only the current state, not the queued events
that will very soon lead to the object's death.
The problem is that fscache_object_state_machine() will
BUG("Unsupported event") when there is object->events includes
EV_INVALIDATE during "terminal_transit". Even if we would ignore that
check, we could run into "Unexpected event in dead state" later
because object->work may still be queued.
The solution is to check for EV_RETIRE and EV_RELEASE; if one of those
two terminal events is already queued, don't bother to queue
EV_INVALIDATE.
Signed-off-by: Max Kellermann <mk@...all.com>
---
fs/fscache/cookie.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
index 8dcb114..ed80d7f 100644
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -402,7 +402,8 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
object = hlist_entry(cookie->backing_objects.first,
struct fscache_object,
cookie_link);
- if (object->state < FSCACHE_OBJECT_DYING)
+ if (object->state < FSCACHE_OBJECT_DYING &&
+ (object->events & (FSCACHE_OBJECT_EV_RETIRE|FSCACHE_OBJECT_EV_RELEASE)) == 0)
fscache_raise_event(
object, FSCACHE_OBJECT_EV_INVALIDATE);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists