These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / ptlrpc / nrs_fifo.c

diff --git a/kernel/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c b/kernel/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c
index eb40c01..8e21f0c 100644 (file)
--- a/kernel/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c
+++ b/kernel/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c
@@ -80,7 +80,9 @@ static int nrs_fifo_start(struct ptlrpc_nrs_policy *policy)
 {
        struct nrs_fifo_head *head;
 
-       OBD_CPT_ALLOC_PTR(head, nrs_pol2cptab(policy), nrs_pol2cptid(policy));
+       head = kzalloc_node(sizeof(*head), GFP_NOFS,
+                           cfs_cpt_spread_node(nrs_pol2cptab(policy),
+                                               nrs_pol2cptid(policy)));
        if (head == NULL)
                return -ENOMEM;
 
@@ -105,7 +107,7 @@ static void nrs_fifo_stop(struct ptlrpc_nrs_policy *policy)
        LASSERT(head != NULL);
        LASSERT(list_empty(&head->fh_list));
 
-       OBD_FREE_PTR(head);
+       kfree(head);
 }
 
 /**
@@ -158,9 +160,9 @@ static int nrs_fifo_res_get(struct ptlrpc_nrs_policy *policy,
  */
 static
 struct ptlrpc_nrs_request *nrs_fifo_req_get(struct ptlrpc_nrs_policy *policy,
-                                            bool peek, bool force)
+                                           bool peek, bool force)
 {
-       struct nrs_fifo_head      *head = policy->pol_private;
+       struct nrs_fifo_head *head = policy->pol_private;
        struct ptlrpc_nrs_request *nrq;
 
        nrq = unlikely(list_empty(&head->fh_list)) ? NULL :