aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-12-05 08:34:46 -0500
committerDavid Howells <dhowells@redhat.com>2012-12-20 17:08:39 -0500
commit03acc4be5e479eebc95338cd1d72a9954c128e2b (patch)
tree5cb12ad8bb385495c36b539a0afa793e6cbefea6
parent36a02de5d7981435931d4608ee3e510b752e072b (diff)
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)
114 /* wait for the parent object to become ready */ 114 /* wait for the parent object to become ready */
115 case FSCACHE_OBJECT_INIT: 115 case FSCACHE_OBJECT_INIT:
116 object->event_mask = 116 object->event_mask =
117 ULONG_MAX & ~(1 << FSCACHE_OBJECT_EV_CLEARED); 117 FSCACHE_OBJECT_EVENTS_MASK &
118 ~(1 << FSCACHE_OBJECT_EV_CLEARED);
118 fscache_initialise_object(object); 119 fscache_initialise_object(object);
119 goto done; 120 goto done;
120 121