Re: [PATCH 4.4 41/46] uapi: fix linux/rds.h userspace compilation errors

[Ben Hutchings]

On Thu, 2017-10-19 at 15:49 +0200, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.ÂÂIf anyone has any objections, please let me know.
> 
> ------------------
> 
> From: "Dmitry V. Levin" <ldv@xxxxxxxxxxxx>
> 
> 
> [ Upstream commit feb0869d90e51ce8b6fd8a46588465b1b5a26d09 ]
> 
> Consistently use types from linux/types.h to fix the following
> linux/rds.h userspace compilation errors:
[...]
> --- a/include/uapi/linux/rds.h
> +++ b/include/uapi/linux/rds.h
> @@ -35,6 +35,7 @@
> Â#define _LINUX_RDS_H
> Â
> Â#include <linux/types.h>
> +#include <linux/socket.h>		/* For __kernel_sockaddr_storage. */
> Â
> Â#define RDS_IB_ABI_VERSION		0x301
> Â
> @@ -223,7 +224,7 @@ struct rds_get_mr_args {
> Â};
> Â
> Âstruct rds_get_mr_for_dest_args {
> -	struct sockaddr_storage	dest_addr;
> +	struct __kernel_sockaddr_storage dest_addr;
> Â	struct rds_iovecÂ	vec;
> Â	uint64_t		cookie_addr;
> Â	uint64_t		flags;

This is a valid fix but not the one that the commit message and
upstream commit hash refer to.  This diff matches:

commit 1786dbf3702e33ce3afd2d3dbe630bd04b1d2e58
Author: Dmitry V. Levin <ldv@xxxxxxxxxxxx>
Date:ÂÂÂThu Feb 16 18:05:45 2017 +0300

ÂÂÂÂuapi: fix linux/rds.h userspace compilation error

which has almost the same subject line.

Maybe you should cherry-pick commit
feb0869d90e51ce8b6fd8a46588465b1b5a26d09 for real as well (in all
branches).

Ben.

--  
Ben Hutchings
Software Developer, Codethink Ltd.