1 files changed, 3 insertions, 6 deletions

diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c
index eced20618ecc..782ee7c600ca 100644
--- a/fs/afs/vlocation.c
+++ b/fs/afs/vlocation.c
@@ -281,11 +281,10 @@ int afs_vlocation_lookup(struct afs_cell *cell,
         spin_unlock(&cell->vl_gylock);
 
         /* not in the cell's in-memory lists - create a new record */
-        vlocation = kmalloc(sizeof(struct afs_vlocation), GFP_KERNEL);
+        vlocation = kzalloc(sizeof(struct afs_vlocation), GFP_KERNEL);
         if (!vlocation)
                 return -ENOMEM;
 
-        memset(vlocation, 0, sizeof(struct afs_vlocation));
         atomic_set(&vlocation->usage, 1);
         INIT_LIST_HEAD(&vlocation->link);
         rwlock_init(&vlocation->lock);
@@ -326,8 +325,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 +476,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) */