From a8b76a7ca8e63f29034ec60c042ba9d14cb8167c Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 5 Dec 2012 13:34:47 +0000
Subject: [PATCH] --- yaml --- r: 347828 b: refs/heads/master c:
 c2d35bfe4b508451b75b5b6bc60a08dbdc44f952 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 483488759fa4..732c0ed4a6d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03acc4be5e479eebc95338cd1d72a9954c128e2b
+refs/heads/master: c2d35bfe4b508451b75b5b6bc60a08dbdc44f952
diff --git a/trunk/fs/cachefiles/namei.c b/trunk/fs/cachefiles/namei.c
index b0b5f7cdfffa..8c01c5fcdf75 100644
--- a/trunk/fs/cachefiles/namei.c
+++ b/trunk/fs/cachefiles/namei.c
@@ -40,8 +40,7 @@ void __cachefiles_printk_object(struct cachefiles_object *object,
 	printk(KERN_ERR "%sobjstate=%s fl=%lx wbusy=%x ev=%lx[%lx]\n",
 	       prefix, fscache_object_states[object->fscache.state],
 	       object->fscache.flags, work_busy(&object->fscache.work),
-	       object->fscache.events,
-	       object->fscache.event_mask & FSCACHE_OBJECT_EVENTS_MASK);
+	       object->fscache.events, object->fscache.event_mask);
 	printk(KERN_ERR "%sops=%u inp=%u exc=%u\n",
 	       prefix, object->fscache.n_ops, object->fscache.n_in_progress,
 	       object->fscache.n_exclusive);
diff --git a/trunk/fs/fscache/object-list.c b/trunk/fs/fscache/object-list.c
index ebe29c581380..f27c89d17885 100644
--- a/trunk/fs/fscache/object-list.c
+++ b/trunk/fs/fscache/object-list.c
@@ -245,7 +245,7 @@ static int fscache_objlist_show(struct seq_file *m, void *v)
 		   obj->n_in_progress,
 		   obj->n_exclusive,
 		   atomic_read(&obj->n_reads),
-		   obj->event_mask & FSCACHE_OBJECT_EVENTS_MASK,
+		   obj->event_mask,
 		   obj->events,
 		   obj->flags,
 		   work_busy(&obj->work));