]> git.baikalelectronics.ru Git - kernel.git/commit
epoll: clean up ep_modify
authorTony Battersby <tonyb@cybernetics.com>
Tue, 31 Mar 2009 22:24:15 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Apr 2009 15:59:19 +0000 (08:59 -0700)
commitaf1bc6673dd56dd11e7c778d7ff9ddb2d4aa1b12
treeaa9e15c13ce5882ca0f0b442eec71d99fec8a4ff
parentd0c5d5e4b8e2370f742065f846209c7c5e047092
epoll: clean up ep_modify

ep_modify() doesn't need to set event.data from within the ep->lock
spinlock as the comment suggests.  The only place event.data is used is
ep_send_events_proc(), and this is protected by ep->mtx instead of
ep->lock.  Also update the comment for mutex_lock() at the top of
ep_scan_ready_list(), which mentions epoll_ctl(EPOLL_CTL_DEL) but not
epoll_ctl(EPOLL_CTL_MOD).

ep_modify() can also use spin_lock_irq() instead of spin_lock_irqsave().

Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/eventpoll.c