summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-12-05 14:34:46 +0100
committerDavid Howells <dhowells@redhat.com>2012-12-20 23:08:39 +0100
commit03acc4be5e479eebc95338cd1d72a9954c128e2b (patch)
tree5cb12ad8bb385495c36b539a0afa793e6cbefea6
parentFS-Cache: Convert the object event ID #defines into an enum (diff)
downloadlinux-03acc4be5e479eebc95338cd1d72a9954c128e2b.tar.xz
linux-03acc4be5e479eebc95338cd1d72a9954c128e2b.zip
FS-Cache: Initialise the object event mask with the calculated mask
Initialise the object event mask with the calculated mask rather than unmasking undefined events also. Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--fs/fscache/object.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fscache/object.c b/fs/fscache/object.c
index 80b549141ea6..2ef8a082a272 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -114,7 +114,8 @@ static void fscache_object_state_machine(struct fscache_object *object)
/* wait for the parent object to become ready */
case FSCACHE_OBJECT_INIT:
object->event_mask =
- ULONG_MAX & ~(1 << FSCACHE_OBJECT_EV_CLEARED);
+ FSCACHE_OBJECT_EVENTS_MASK &
+ ~(1 << FSCACHE_OBJECT_EV_CLEARED);
fscache_initialise_object(object);
goto done;