pNFS: Add helpers for allocation/free of struct nfs4_pnfs_ds_addr

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
index ee6d003db844c4174369fe3c7a02dbed7ed82493..c3c04a7639850a2001050a4f83f8ee9f61a45666 100644 (file)
--- a/fs/nfs/pnfs_nfs.c
+++ b/fs/nfs/pnfs_nfs.c
@@ -661,6 +661,20 @@ _data_server_lookup_locked(const struct list_head *dsaddrs)
        return NULL;
 }
 
+static struct nfs4_pnfs_ds_addr *nfs4_pnfs_ds_addr_alloc(gfp_t gfp_flags)
+{
+       struct nfs4_pnfs_ds_addr *da = kzalloc(sizeof(*da), gfp_flags);
+       if (da)
+               INIT_LIST_HEAD(&da->da_node);
+       return da;
+}
+
+static void nfs4_pnfs_ds_addr_free(struct nfs4_pnfs_ds_addr *da)
+{
+       kfree(da->da_remotestr);
+       kfree(da);
+}
+
 static void destroy_ds(struct nfs4_pnfs_ds *ds)
 {
        struct nfs4_pnfs_ds_addr *da;
@@ -676,8 +690,7 @@ static void destroy_ds(struct nfs4_pnfs_ds *ds)
                                      struct nfs4_pnfs_ds_addr,
                                      da_node);
                list_del_init(&da->da_node);
-               kfree(da->da_remotestr);
-               kfree(da);
+               nfs4_pnfs_ds_addr_free(da);
        }
 
        kfree(ds->ds_remotestr);
@@ -1094,12 +1107,10 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags)
        }
        *portstr = '\0';
 
-       da = kzalloc(sizeof(*da), gfp_flags);
+       da = nfs4_pnfs_ds_addr_alloc(gfp_flags);
        if (unlikely(!da))
                goto out_free_buf;
 
-       INIT_LIST_HEAD(&da->da_node);
-
        if (!rpc_pton(net, buf, portstr-buf, (struct sockaddr *)&da->da_addr,
                      sizeof(da->da_addr))) {
                dprintk("%s: error parsing address %s\n", __func__, buf);