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 4a09af9e9a6..ff12f7ac73e 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 also acquired when inserting an epoll fd onto another epoll | 66 | * It is also acquired when inserting an epoll fd onto another epoll |
67 | * fd. We do this so that we walk the epoll tree and ensure that this | 67 | * fd. We do this so that we walk the epoll tree and ensure that this |
68 | * insertion does not create a cycle of epoll file descriptors, which | 68 | * insertion does not create a cycle of epoll file descriptors, which |
@@ -152,11 +152,11 @@ struct epitem { | |||
152 | 152 | ||
153 | /* | 153 | /* |
154 | * This structure is stored inside the "private_data" member of the file | 154 | * This structure is stored inside the "private_data" member of the file |
155 | * structure and rapresent the main data sructure for the eventpoll | 155 | * structure and represents the main data structure for the eventpoll |
156 | * interface. | 156 | * interface. |
157 | */ | 157 | */ |
158 | struct eventpoll { | 158 | struct eventpoll { |
159 | /* Protect the this structure access */ | 159 | /* Protect the access to this structure */ |
160 | spinlock_t lock; | 160 | spinlock_t lock; |
161 | 161 | ||
162 | /* | 162 | /* |
@@ -793,7 +793,7 @@ static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd) | |||
793 | 793 | ||
794 | /* | 794 | /* |
795 | * This is the callback that is passed to the wait queue wakeup | 795 | * This is the callback that is passed to the wait queue wakeup |
796 | * machanism. It is called by the stored file descriptors when they | 796 | * mechanism. It is called by the stored file descriptors when they |
797 | * have events to report. | 797 | * have events to report. |
798 | */ | 798 | */ |
799 | static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *key) | 799 | static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *key) |
@@ -824,9 +824,9 @@ static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k | |||
824 | goto out_unlock; | 824 | goto out_unlock; |
825 | 825 | ||
826 | /* | 826 | /* |
827 | * If we are trasfering events to userspace, we can hold no locks | 827 | * If we are transferring events to userspace, we can hold no locks |
828 | * (because we're accessing user memory, and because of linux f_op->poll() | 828 | * (because we're accessing user memory, and because of linux f_op->poll() |
829 | * semantics). All the events that happens during that period of time are | 829 | * semantics). All the events that happen during that period of time are |
830 | * chained in ep->ovflist and requeued later on. | 830 | * chained in ep->ovflist and requeued later on. |
831 | */ | 831 | */ |
832 | if (unlikely(ep->ovflist != EP_UNACTIVE_PTR)) { | 832 | if (unlikely(ep->ovflist != EP_UNACTIVE_PTR)) { |