IB/qib: Don't rely on (undefined) order of function parameter evaluation

Some of the qib sysfs code passes a buffer pointer into
simple_read_from_buffer() but relies on a function call in another
parameter of the same call to initialize that pointer.  Since the order
of evaluation of function parameters is undefined, this will break if
gcc chooses the wrong order.

Fix this by splitting the code into two separate function calls.

This was noticed because of warnings like the following on ppc:

    drivers/infiniband/hw/qib/qib_fs.c: In function 'portcntrs_2_read':
    drivers/infiniband/hw/qib/qib_fs.c:203: warning: 'counters' is used uninitialized in this function

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index 755470440ef1f4b09334cde9b20dc761ab7358d4..edef8527eb34899a85c4b61fd33605e240bda49c 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -144,10 +144,11 @@ static ssize_t dev_counters_read(struct file *file, char __user *buf,
                                 size_t count, loff_t *ppos)
 {
        u64 *counters;
+       size_t avail;
        struct qib_devdata *dd = private2dd(file);
 
-       return simple_read_from_buffer(buf, count, ppos, counters,
-               dd->f_read_cntrs(dd, *ppos, NULL, &counters));
+       avail = dd->f_read_cntrs(dd, *ppos, NULL, &counters);
+       return simple_read_from_buffer(buf, count, ppos, counters, avail);
 }
 
 /* read the per-device counters */
@@ -155,10 +156,11 @@ static ssize_t dev_names_read(struct file *file, char __user *buf,
                              size_t count, loff_t *ppos)
 {
        char *names;
+       size_t avail;
        struct qib_devdata *dd = private2dd(file);
 
-       return simple_read_from_buffer(buf, count, ppos, names,
-               dd->f_read_cntrs(dd, *ppos, &names, NULL));
+       avail = dd->f_read_cntrs(dd, *ppos, &names, NULL);
+       return simple_read_from_buffer(buf, count, ppos, names, avail);
 }
 
 static const struct file_operations cntr_ops[] = {
@@ -176,10 +178,11 @@ static ssize_t portnames_read(struct file *file, char __user *buf,
                              size_t count, loff_t *ppos)
 {
        char *names;
+       size_t avail;
        struct qib_devdata *dd = private2dd(file);
 
-       return simple_read_from_buffer(buf, count, ppos, names,
-               dd->f_read_portcntrs(dd, *ppos, 0, &names, NULL));
+       avail = dd->f_read_portcntrs(dd, *ppos, 0, &names, NULL);
+       return simple_read_from_buffer(buf, count, ppos, names, avail);
 }
 
 /* read the per-port counters for port 1 (pidx 0) */
@@ -187,10 +190,11 @@ static ssize_t portcntrs_1_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
        u64 *counters;
+       size_t avail;
        struct qib_devdata *dd = private2dd(file);
 
-       return simple_read_from_buffer(buf, count, ppos, counters,
-               dd->f_read_portcntrs(dd, *ppos, 0, NULL, &counters));
+       avail = dd->f_read_portcntrs(dd, *ppos, 0, NULL, &counters);
+       return simple_read_from_buffer(buf, count, ppos, counters, avail);
 }
 
 /* read the per-port counters for port 2 (pidx 1) */
@@ -198,10 +202,11 @@ static ssize_t portcntrs_2_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
        u64 *counters;
+       size_t avail;
        struct qib_devdata *dd = private2dd(file);
 
-       return simple_read_from_buffer(buf, count, ppos, counters,
-               dd->f_read_portcntrs(dd, *ppos, 1, NULL, &counters));
+       avail = dd->f_read_portcntrs(dd, *ppos, 1, NULL, &counters);
+       return simple_read_from_buffer(buf, count, ppos, counters, avail);
 }
 
 static const struct file_operations portcntr_ops[] = {