Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33643
b: refs/heads/master
c: 45f17e0
h: refs/heads/master
i:
  33641: f408377
  33639: 4125925
v: v3
  • Loading branch information
Masoud Asgharifard Sharbiani authored and Linus Torvalds committed Aug 27, 2006
1 parent dfc82f7 commit 670a566
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e88d78f6ba50d773096e26ca3f5c2464853c682d
refs/heads/master: 45f17e0c2ae05c133a348452690de0e5fa863293
4 changes: 2 additions & 2 deletions trunk/fs/eventpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 670a566

Please sign in to comment.