Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bfba4e8 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

[PATCH] core: use list_move() 



This patch converts the combination of list_del(A) and list_add(A, B) to
list_move(A, B).

Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: default avatarAkinobu Mita <mita@miraclelinux.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a7addcea

drivers/base/power/resume.c

+2 −4
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ void dpm_resume(void) 
		struct device * dev = to_device(entry);



		get_device(dev);

		list_del_init(entry);

		list_add_tail(entry, &dpm_active);

		list_move_tail(entry, &dpm_active);



		up(&dpm_list_sem);

		if (!dev->power.prev_state.event)
@@ -101,8 +100,7 @@ void dpm_power_up(void) 
		struct device * dev = to_device(entry);



		get_device(dev);

		list_del_init(entry);

		list_add_tail(entry, &dpm_active);

		list_move_tail(entry, &dpm_active);

		resume_device(dev);

		put_device(dev);

	}

drivers/base/power/suspend.c

+5 −8
Original line number Diff line number Diff line
@@ -116,12 +116,10 @@ int device_suspend(pm_message_t state) 
		/* Check if the device got removed */

		if (!list_empty(&dev->power.entry)) {

			/* Move it to the dpm_off or dpm_off_irq list */

			if (!error) {

				list_del(&dev->power.entry);

				list_add(&dev->power.entry, &dpm_off);

			} else if (error == -EAGAIN) {

				list_del(&dev->power.entry);

				list_add(&dev->power.entry, &dpm_off_irq);

			if (!error)

				list_move(&dev->power.entry, &dpm_off);

			else if (error == -EAGAIN) {

				list_move(&dev->power.entry, &dpm_off_irq);

				error = 0;

			}

		}
@@ -139,8 +137,7 @@ int device_suspend(pm_message_t state) 
		 */

		while (!list_empty(&dpm_off_irq)) {

			struct list_head * entry = dpm_off_irq.next;

			list_del(entry);

			list_add(entry, &dpm_off);

			list_move(entry, &dpm_off);

		}

		dpm_resume();

	}

fs/dcache.c

+1 −2
Original line number Diff line number Diff line
@@ -522,8 +522,7 @@ void shrink_dcache_sb(struct super_block * sb) 
		dentry = list_entry(tmp, struct dentry, d_lru);

		if (dentry->d_sb != sb)

			continue;

		list_del(tmp);

		list_add(tmp, &dentry_unused);

		list_move(tmp, &dentry_unused);

	}



	/*

fs/libfs.c

+4 −6
Original line number Diff line number Diff line
@@ -149,10 +149,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) 
			/* fallthrough */

		default:

			spin_lock(&dcache_lock);

			if (filp->f_pos == 2) {

				list_del(q);

				list_add(q, &dentry->d_subdirs);

			}

			if (filp->f_pos == 2)

				list_move(q, &dentry->d_subdirs);



			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {

				struct dentry *next;

				next = list_entry(p, struct dentry, d_u.d_child);
@@ -164,8 +163,7 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) 
					return 0;

				spin_lock(&dcache_lock);

				/* next is still alive */

				list_del(q);

				list_add(q, p);

				list_move(q, p);

				p = q;

				filp->f_pos++;

			}

fs/namespace.c

+2 −4
Original line number Diff line number Diff line
@@ -526,10 +526,8 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill) 
{

	struct vfsmount *p;



	for (p = mnt; p; p = next_mnt(p, mnt)) {

		list_del(&p->mnt_hash);

		list_add(&p->mnt_hash, kill);

	}

	for (p = mnt; p; p = next_mnt(p, mnt))

		list_move(&p->mnt_hash, kill);



	if (propagate)

		propagate_umount(kill);