basic modification from way back

[powerpc.git] / fs / eventpoll.c

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 997711c..b5c7ca5 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -22,7 +22,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/list.h>
 #include <linux/hash.h>
@@ -454,7 +453,7 @@ void eventpoll_release_file(struct file *file)
        mutex_lock(&epmutex);
 
        while (!list_empty(lsthead)) {
-               epi = list_entry(lsthead->next, struct epitem, fllink);
+               epi = list_first_entry(lsthead, struct epitem, fllink);
 
                ep = epi->ep;
                list_del_init(&epi->fllink);
@@ -1144,7 +1143,7 @@ static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi)
 
        if (nwait) {
                while (!list_empty(lsthead)) {
-                       pwq = list_entry(lsthead->next, struct eppoll_entry, llink);
+                       pwq = list_first_entry(lsthead, struct eppoll_entry, llink);
 
                        list_del_init(&pwq->llink);
                        remove_wait_queue(pwq->whead, &pwq->wait);
@@ -1360,7 +1359,7 @@ static int ep_send_events(struct eventpoll *ep, struct list_head *txlist,
         * read.
         */
        for (eventcnt = 0; !list_empty(txlist) && eventcnt < maxevents;) {
-               epi = list_entry(txlist->next, struct epitem, rdllink);
+               epi = list_first_entry(txlist, struct epitem, rdllink);
                prefetch(epi->rdllink.next);
 
                /*