From 81dec8e2e604eb2978235b7bf7e83f42049c3662 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 5 Dec 2012 13:34:46 +0000
Subject: [PATCH] --- yaml --- r: 347827 b: refs/heads/master c:
 03acc4be5e479eebc95338cd1d72a9954c128e2b h: refs/heads/master i:   347825:
 37bf530c3eca0a34dfc9491a59313c9592a78495   347823:
 5c60ad8d8a91d4cc730f6ebfafc1a80f2bf1f0c3 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/fscache/object.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2619657ea57d..483488759fa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36a02de5d7981435931d4608ee3e510b752e072b
+refs/heads/master: 03acc4be5e479eebc95338cd1d72a9954c128e2b
diff --git a/trunk/fs/fscache/object.c b/trunk/fs/fscache/object.c
index 80b549141ea6..2ef8a082a272 100644
--- a/trunk/fs/fscache/object.c
+++ b/trunk/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;