LU-9679 ptlrpc: use OBD_ALLOC_PTR_ARRAY() and FREE

[fs/lustre-release.git] / lustre / ptlrpc / lproc_ptlrpc.c

diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c
index 579a175..ee5e8c3 100644 (file)
--- a/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/lustre/ptlrpc/lproc_ptlrpc.c
@@ -559,7 +559,7 @@ static int ptlrpc_lprocfs_nrs_seq_show(struct seq_file *m, void *n)
        num_pols = svc->srv_parts[0]->scp_nrs_reg.nrs_num_pols;
        spin_unlock(&nrs->nrs_lock);
 
-       OBD_ALLOC(infos, num_pols * sizeof(*infos));
+       OBD_ALLOC_PTR_ARRAY(infos, num_pols);
        if (infos == NULL)
                GOTO(out, rc = -ENOMEM);
 again:
@@ -681,7 +681,7 @@ again:
 
 out:
        if (infos)
-               OBD_FREE(infos, num_pols * sizeof(*infos));
+               OBD_FREE_PTR_ARRAY(infos, num_pols);
 
        mutex_unlock(&nrs_core.nrs_mutex);
 
@@ -1330,7 +1330,9 @@ EXPORT_SYMBOL(ping_show);
 ssize_t ping_store(struct kobject *kobj, struct attribute *attr,
                   const char *buffer, size_t count)
 {
-       return ping_show(kobj, attr, (char *)buffer);
+       int rc = ping_show(kobj, attr, (char *)buffer);
+
+       return (rc < 0) ? rc : count;
 }
 EXPORT_SYMBOL(ping_store);