summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasoud Asgharifard Sharbiani <masouds@google.com>2006-08-27 01:23:48 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-27 11:01:31 -0700
commit45f17e0c2ae05c133a348452690de0e5fa863293 (patch)
tree4c00cf9666bd0293165d5afa13753120e8329621
parente88d78f6ba50d773096e26ca3f5c2464853c682d (diff)
downloadop-kernel-dev-45f17e0c2ae05c133a348452690de0e5fa863293.zip
op-kernel-dev-45f17e0c2ae05c133a348452690de0e5fa863293.tar.gz
[PATCH] eventpoll.c compile fix
Fix two compile failures in eventpoll.c code which would happen if DEBUG_EPOLL is bigger than zero. Signed-off-by: Masoud Sharbiani <masouds@google.com> Cc: Davide Libenzi <davidel@xmailserver.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/eventpoll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 19ffb04..3a35674 100644
--- a/fs/eventpoll.c
+++ b/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);
OpenPOWER on IntegriCloud