From 670a56638cbf7bbe59cf9e4c37d8476ff5418110 Mon Sep 17 00:00:00 2001 From: Masoud Asgharifard Sharbiani Date: Sun, 27 Aug 2006 01:23:48 -0700 Subject: [PATCH] --- yaml --- r: 33643 b: refs/heads/master c: 45f17e0c2ae05c133a348452690de0e5fa863293 h: refs/heads/master i: 33641: f40837723a8084c9fb64d0e6c64654932e0c84b5 33639: 4125925c7494f4b887759eae89d3f970f8f3ffa8 v: v3 --- [refs] | 2 +- trunk/fs/eventpoll.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c28d7d5b2a9..eb76f3d5502d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e88d78f6ba50d773096e26ca3f5c2464853c682d +refs/heads/master: 45f17e0c2ae05c133a348452690de0e5fa863293 diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c index 19ffb043abbc..3a3567433b92 100644 --- a/trunk/fs/eventpoll.c +++ b/trunk/fs/eventpoll.c @@ -1168,7 +1168,7 @@ static int ep_unlink(struct eventpoll *ep, struct epitem *epi) eexit_1: DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_unlink(%p, %p) = %d\n", - current, ep, epi->file, error)); + current, ep, epi->ffd.file, error)); return error; } @@ -1236,7 +1236,7 @@ static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k struct eventpoll *ep = epi->ep; DNPRINTK(3, (KERN_INFO "[%p] eventpoll: poll_callback(%p) epi=%p ep=%p\n", - current, epi->file, epi, ep)); + current, epi->ffd.file, epi, ep)); write_lock_irqsave(&ep->lock, flags);