aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPavel Emelianov <xemul@sw.ru>2007-05-08 03:30:19 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:11 -0400
commitb5e618181a927210f8be1d3d2249d31904ba358d (patch)
tree731f1ae4ff1ba56d402bb329182b7d935bb439a1 /fs
parentdb9c02fa8bd50eb104781a9f78cae923d8da1e74 (diff)
Introduce a handy list_first_entry macro
There are many places in the kernel where the construction like foo = list_entry(head->next, struct foo_struct, list); are used. The code might look more descriptive and neat if using the macro list_first_entry(head, type, member) \ list_entry((head)->next, type, member) Here is the macro itself and the examples of its usage in the generic code. If it will turn out to be useful, I can prepare the set of patches to inject in into arch-specific code, drivers, networking, etc. Signed-off-by: Pavel Emelianov <xemul@openvz.org> Signed-off-by: Kirill Korotaev <dev@openvz.org> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Zach Brown <zach.brown@oracle.com> Cc: Davide Libenzi <davidel@xmailserver.org> Cc: John McCutchan <ttb@tentacle.dhs.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: john stultz <johnstul@us.ibm.com> Cc: Ram Pai <linuxram@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/dquot.c2
-rw-r--r--fs/eventpoll.c6
-rw-r--r--fs/inode.c2
-rw-r--r--fs/inotify.c2
-rw-r--r--fs/namespace.c4
-rw-r--r--fs/pnode.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/fs/dquot.c b/fs/dquot.c
index dcc5a582e1f1..3a995841de90 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -474,7 +474,7 @@ int vfs_quota_sync(struct super_block *sb, int type)
474 spin_lock(&dq_list_lock); 474 spin_lock(&dq_list_lock);
475 dirty = &dqopt->info[cnt].dqi_dirty_list; 475 dirty = &dqopt->info[cnt].dqi_dirty_list;
476 while (!list_empty(dirty)) { 476 while (!list_empty(dirty)) {
477 dquot = list_entry(dirty->next, struct dquot, dq_dirty); 477 dquot = list_first_entry(dirty, struct dquot, dq_dirty);
478 /* Dirty and inactive can be only bad dquot... */ 478 /* Dirty and inactive can be only bad dquot... */
479 if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) { 479 if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
480 clear_dquot_dirty(dquot); 480 clear_dquot_dirty(dquot);
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index d0b86060cc19..b5c7ca584939 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -453,7 +453,7 @@ void eventpoll_release_file(struct file *file)
453 mutex_lock(&epmutex); 453 mutex_lock(&epmutex);
454 454
455 while (!list_empty(lsthead)) { 455 while (!list_empty(lsthead)) {
456 epi = list_entry(lsthead->next, struct epitem, fllink); 456 epi = list_first_entry(lsthead, struct epitem, fllink);
457 457
458 ep = epi->ep; 458 ep = epi->ep;
459 list_del_init(&epi->fllink); 459 list_del_init(&epi->fllink);
@@ -1143,7 +1143,7 @@ static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi)
1143 1143
1144 if (nwait) { 1144 if (nwait) {
1145 while (!list_empty(lsthead)) { 1145 while (!list_empty(lsthead)) {
1146 pwq = list_entry(lsthead->next, struct eppoll_entry, llink); 1146 pwq = list_first_entry(lsthead, struct eppoll_entry, llink);
1147 1147
1148 list_del_init(&pwq->llink); 1148 list_del_init(&pwq->llink);
1149 remove_wait_queue(pwq->whead, &pwq->wait); 1149 remove_wait_queue(pwq->whead, &pwq->wait);
@@ -1359,7 +1359,7 @@ static int ep_send_events(struct eventpoll *ep, struct list_head *txlist,
1359 * read. 1359 * read.
1360 */ 1360 */
1361 for (eventcnt = 0; !list_empty(txlist) && eventcnt < maxevents;) { 1361 for (eventcnt = 0; !list_empty(txlist) && eventcnt < maxevents;) {
1362 epi = list_entry(txlist->next, struct epitem, rdllink); 1362 epi = list_first_entry(txlist, struct epitem, rdllink);
1363 prefetch(epi->rdllink.next); 1363 prefetch(epi->rdllink.next);
1364 1364
1365 /* 1365 /*
diff --git a/fs/inode.c b/fs/inode.c
index 81508b0a3a70..410f235c337b 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -275,7 +275,7 @@ static void dispose_list(struct list_head *head)
275 while (!list_empty(head)) { 275 while (!list_empty(head)) {
276 struct inode *inode; 276 struct inode *inode;
277 277
278 inode = list_entry(head->next, struct inode, i_list); 278 inode = list_first_entry(head, struct inode, i_list);
279 list_del(&inode->i_list); 279 list_del(&inode->i_list);
280 280
281 if (inode->i_data.nrpages) 281 if (inode->i_data.nrpages)
diff --git a/fs/inotify.c b/fs/inotify.c
index f5099d86fd91..7457501b9565 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -509,7 +509,7 @@ void inotify_destroy(struct inotify_handle *ih)
509 mutex_unlock(&ih->mutex); 509 mutex_unlock(&ih->mutex);
510 break; 510 break;
511 } 511 }
512 watch = list_entry(watches->next, struct inotify_watch, h_list); 512 watch = list_first_entry(watches, struct inotify_watch, h_list);
513 get_inotify_watch(watch); 513 get_inotify_watch(watch);
514 mutex_unlock(&ih->mutex); 514 mutex_unlock(&ih->mutex);
515 515
diff --git a/fs/namespace.c b/fs/namespace.c
index c5b88100d914..72bb1062bfe7 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -499,7 +499,7 @@ void release_mounts(struct list_head *head)
499{ 499{
500 struct vfsmount *mnt; 500 struct vfsmount *mnt;
501 while (!list_empty(head)) { 501 while (!list_empty(head)) {
502 mnt = list_entry(head->next, struct vfsmount, mnt_hash); 502 mnt = list_first_entry(head, struct vfsmount, mnt_hash);
503 list_del_init(&mnt->mnt_hash); 503 list_del_init(&mnt->mnt_hash);
504 if (mnt->mnt_parent != mnt) { 504 if (mnt->mnt_parent != mnt) {
505 struct dentry *dentry; 505 struct dentry *dentry;
@@ -1177,7 +1177,7 @@ static void expire_mount_list(struct list_head *graveyard, struct list_head *mou
1177 1177
1178 while (!list_empty(graveyard)) { 1178 while (!list_empty(graveyard)) {
1179 LIST_HEAD(umounts); 1179 LIST_HEAD(umounts);
1180 mnt = list_entry(graveyard->next, struct vfsmount, mnt_expire); 1180 mnt = list_first_entry(graveyard, struct vfsmount, mnt_expire);
1181 list_del_init(&mnt->mnt_expire); 1181 list_del_init(&mnt->mnt_expire);
1182 1182
1183 /* don't do anything if the namespace is dead - all the 1183 /* don't do anything if the namespace is dead - all the
diff --git a/fs/pnode.c b/fs/pnode.c
index 56aacead8362..89940f243fc2 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -59,7 +59,7 @@ static int do_make_slave(struct vfsmount *mnt)
59 } else { 59 } else {
60 struct list_head *p = &mnt->mnt_slave_list; 60 struct list_head *p = &mnt->mnt_slave_list;
61 while (!list_empty(p)) { 61 while (!list_empty(p)) {
62 slave_mnt = list_entry(p->next, 62 slave_mnt = list_first_entry(p,
63 struct vfsmount, mnt_slave); 63 struct vfsmount, mnt_slave);
64 list_del_init(&slave_mnt->mnt_slave); 64 list_del_init(&slave_mnt->mnt_slave);
65 slave_mnt->mnt_master = NULL; 65 slave_mnt->mnt_master = NULL;