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

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

[PATCH] fs: use list_move() 



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

Cc: Ian Kent <raven@themaw.net>
Acked-by: default avatarJoel Becker <joel.becker@oracle.com>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Hans Reiser <reiserfs-dev@namesys.com>
Cc: Urban Widmark <urban@teststation.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarMark Fasheh <mark.fasheh@oracle.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 179e0917

fs/afs/cell.c

+1 −2
Original line number Diff line number Diff line
@@ -413,8 +413,7 @@ int afs_server_find_by_peer(const struct rxrpc_peer *peer, 


	/* we found it in the graveyard - resurrect it */

 found_dead_server:

	list_del(&server->link);

	list_add_tail(&server->link, &cell->sv_list);

	list_move_tail(&server->link, &cell->sv_list);

	afs_get_server(server);

	afs_kafstimod_del_timer(&server->timeout);

	spin_unlock(&cell->sv_gylock);

fs/afs/kafsasyncd.c

+3 −6
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ static int kafsasyncd(void *arg) 
			if (!list_empty(&kafsasyncd_async_attnq)) {

				op = list_entry(kafsasyncd_async_attnq.next,

						struct afs_async_op, link);

				list_del(&op->link);

				list_add_tail(&op->link,

				list_move_tail(&op->link,

					      &kafsasyncd_async_busyq);

			}
@@ -204,8 +203,7 @@ void afs_kafsasyncd_begin_op(struct afs_async_op *op) 
	init_waitqueue_entry(&op->waiter, kafsasyncd_task);

	add_wait_queue(&op->call->waitq, &op->waiter);



	list_del(&op->link);

	list_add_tail(&op->link, &kafsasyncd_async_busyq);

	list_move_tail(&op->link, &kafsasyncd_async_busyq);



	spin_unlock(&kafsasyncd_async_lock);
@@ -223,8 +221,7 @@ void afs_kafsasyncd_attend_op(struct afs_async_op *op) 


	spin_lock(&kafsasyncd_async_lock);



	list_del(&op->link);

	list_add_tail(&op->link, &kafsasyncd_async_attnq);

	list_move_tail(&op->link, &kafsasyncd_async_attnq);



	spin_unlock(&kafsasyncd_async_lock);

fs/afs/server.c

+2 −4
Original line number Diff line number Diff line
@@ -123,8 +123,7 @@ int afs_server_lookup(struct afs_cell *cell, const struct in_addr *addr, 
 resurrect_server:

	_debug("resurrecting server");



	list_del(&zombie->link);

	list_add_tail(&zombie->link, &cell->sv_list);

	list_move_tail(&zombie->link, &cell->sv_list);

	afs_get_server(zombie);

	afs_kafstimod_del_timer(&zombie->timeout);

	spin_unlock(&cell->sv_gylock);
@@ -168,8 +167,7 @@ void afs_put_server(struct afs_server *server) 
	}



	spin_lock(&cell->sv_gylock);

	list_del(&server->link);

	list_add_tail(&server->link, &cell->sv_graveyard);

	list_move_tail(&server->link, &cell->sv_graveyard);



	/* time out in 10 secs */

	afs_kafstimod_add_timer(&server->timeout, 10 * HZ);

fs/afs/vlocation.c

+2 −4
Original line number Diff line number Diff line
@@ -326,8 +326,7 @@ int afs_vlocation_lookup(struct afs_cell *cell, 
	/* found in the graveyard - resurrect */

	_debug("found in graveyard");

	atomic_inc(&vlocation->usage);

	list_del(&vlocation->link);

	list_add_tail(&vlocation->link, &cell->vl_list);

	list_move_tail(&vlocation->link, &cell->vl_list);

	spin_unlock(&cell->vl_gylock);



	afs_kafstimod_del_timer(&vlocation->timeout);
@@ -478,8 +477,7 @@ static void __afs_put_vlocation(struct afs_vlocation *vlocation) 
	}



	/* move to graveyard queue */

	list_del(&vlocation->link);

	list_add_tail(&vlocation->link,&cell->vl_graveyard);

	list_move_tail(&vlocation->link,&cell->vl_graveyard);



	/* remove from pending timeout queue (refcounted if actually being

	 * updated) */

fs/afs/vnode.c

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ static void afs_vnode_finalise_status_update(struct afs_vnode *vnode, 
					vnode->cb_expiry * HZ);



		spin_lock(&afs_cb_hash_lock);

		list_del(&vnode->cb_hash_link);

		list_add_tail(&vnode->cb_hash_link,

		list_move_tail(&vnode->cb_hash_link,

			      &afs_cb_hash(server, &vnode->fid));

		spin_unlock(&afs_cb_hash_lock);