diff options
Diffstat (limited to 'fs/eventpoll.c')
-rw-r--r-- | fs/eventpoll.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 267d0ada4541..7513066cca21 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
@@ -62,7 +62,7 @@ | |||
62 | * This mutex is acquired by ep_free() during the epoll file | 62 | * This mutex is acquired by ep_free() during the epoll file |
63 | * cleanup path and it is also acquired by eventpoll_release_file() | 63 | * cleanup path and it is also acquired by eventpoll_release_file() |
64 | * if a file has been pushed inside an epoll set and it is then | 64 | * if a file has been pushed inside an epoll set and it is then |
65 | * close()d without a previous call toepoll_ctl(EPOLL_CTL_DEL). | 65 | * close()d without a previous call to epoll_ctl(EPOLL_CTL_DEL). |
66 | * It is possible to drop the "ep->mtx" and to use the global | 66 | * It is possible to drop the "ep->mtx" and to use the global |
67 | * mutex "epmutex" (together with "ep->lock") to have it working, | 67 | * mutex "epmutex" (together with "ep->lock") to have it working, |
68 | * but having "ep->mtx" will make the interface more scalable. | 68 | * but having "ep->mtx" will make the interface more scalable. |
@@ -145,11 +145,11 @@ struct epitem { | |||
145 | 145 | ||
146 | /* | 146 | /* |
147 | * This structure is stored inside the "private_data" member of the file | 147 | * This structure is stored inside the "private_data" member of the file |
148 | * structure and rapresent the main data sructure for the eventpoll | 148 | * structure and represents the main data structure for the eventpoll |
149 | * interface. | 149 | * interface. |
150 | */ | 150 | */ |
151 | struct eventpoll { | 151 | struct eventpoll { |
152 | /* Protect the this structure access */ | 152 | /* Protect the access to this structure */ |
153 | spinlock_t lock; | 153 | spinlock_t lock; |
154 | 154 | ||
155 | /* | 155 | /* |
@@ -783,7 +783,7 @@ static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd) | |||
783 | 783 | ||
784 | /* | 784 | /* |
785 | * This is the callback that is passed to the wait queue wakeup | 785 | * This is the callback that is passed to the wait queue wakeup |
786 | * machanism. It is called by the stored file descriptors when they | 786 | * mechanism. It is called by the stored file descriptors when they |
787 | * have events to report. | 787 | * have events to report. |
788 | */ | 788 | */ |
789 | static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *key) | 789 | static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *key) |
@@ -814,9 +814,9 @@ static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k | |||
814 | goto out_unlock; | 814 | goto out_unlock; |
815 | 815 | ||
816 | /* | 816 | /* |
817 | * If we are trasfering events to userspace, we can hold no locks | 817 | * If we are transferring events to userspace, we can hold no locks |
818 | * (because we're accessing user memory, and because of linux f_op->poll() | 818 | * (because we're accessing user memory, and because of linux f_op->poll() |
819 | * semantics). All the events that happens during that period of time are | 819 | * semantics). All the events that happen during that period of time are |
820 | * chained in ep->ovflist and requeued later on. | 820 | * chained in ep->ovflist and requeued later on. |
821 | */ | 821 | */ |
822 | if (unlikely(ep->ovflist != EP_UNACTIVE_PTR)) { | 822 | if (unlikely(ep->ovflist != EP_UNACTIVE_PTR)) { |