rbd: Remove VLA saving ack buffer size
Subsystems (2)
PATCH 1/1 rbd: Remove VLA saving ack buffer size
The kernel would like to have all stack VLA usage removed[1]. Here the array is declared using a variable that is declared using a constant statement but the compiler still emits a warning. We can clear the warning bu using the constant statement directly. The buffer size variable is set to zero on the error path; the buffer size variable is used later in the function, we can maintain this behavior by setting the variable using the macro ARRAY_SIZE.
Use constant statement to declare array.
[1]: https://lkml.org/lkml/2018/3/7/621
Signed-off-by Tobin C. Harding <[email protected]>
---
Excuse the lack of threading, I forgot the second patch ;) Can re-send threaded correctly if required.
drivers/block/rbd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/block/rbd.c +3 -2
@@ -3618,13 +3618,14 @@ static void __rbd_acknowledge_notify(struct rbd_device *rbd_dev, u64 notify_id, u64 cookie, s32 *result) { struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; -int buf_size =4 +CEPH_ENCODING_START_BLK_LEN ; -char buf[buf_size]; +char buf[4 +CEPH_ENCODING_START_BLK_LEN ]; +int buf_size;int ret;if (result) {void *p = buf; + buf_size =ARRAY_SIZE (buf);/* encode ResponseMessage */ ceph_start_encoding (&p,1 ,1 , buf_size -CEPH_ENCODING_START_BLK_LEN );
Signature · 1 line
2.7.4