2013-05-16 20:25:32

by Jan Stancek

[permalink] [raw]
Subject: [PATCH] clnt_vc_control: fix VERS/PROG size

Following commit converted some operations to use memcpy, but the size
of copied areas is now u_long, previously it was u_int32_t:
commit fac3eb51c7055055bdd7dccd9db556d9e4a1cf35
Author: Steve Dickson <[email protected]>
Date: Tue Feb 12 14:26:31 2013 -0500
clnt_vc_control: Removed a strict-aliasing warning

This broke mount on ppc64/s390x:
# ./mount.nfs -vvv -onfsvers=3,tcp rhel6-nfs:/export/home /mnt/test
mount.nfs: timeout set for Fri May 3 15:20:14 2013
mount.nfs: trying text-based options 'nfsvers=3,tcp,addr=10.1.1.5'
mount.nfs: prog 100003, trying vers=3, prot=6
mount.nfs: portmap query failed: RPC: Program/version mismatch
mount.nfs: Protocol not supported

Signed-off-by: Jan Stancek <[email protected]>
---
src/clnt_vc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/clnt_vc.c b/src/clnt_vc.c
index 7769809..2eab9e4 100644
--- a/src/clnt_vc.c
+++ b/src/clnt_vc.c
@@ -505,7 +505,7 @@ clnt_vc_control(cl, request, info)
sigset_t newmask;
int rpc_lock_value;
u_int32_t tmp;
- u_long ltmp;
+ u_int32_t ltmp;

assert(cl != NULL);

--
1.7.1



2013-05-28 17:47:41

by Steve Dickson

[permalink] [raw]
Subject: Re: [PATCH] clnt_vc_control: fix VERS/PROG size



On 16/05/13 16:25, Jan Stancek wrote:
> Following commit converted some operations to use memcpy, but the size
> of copied areas is now u_long, previously it was u_int32_t:
> commit fac3eb51c7055055bdd7dccd9db556d9e4a1cf35
> Author: Steve Dickson <[email protected]>
> Date: Tue Feb 12 14:26:31 2013 -0500
> clnt_vc_control: Removed a strict-aliasing warning
>
> This broke mount on ppc64/s390x:
> # ./mount.nfs -vvv -onfsvers=3,tcp rhel6-nfs:/export/home /mnt/test
> mount.nfs: timeout set for Fri May 3 15:20:14 2013
> mount.nfs: trying text-based options 'nfsvers=3,tcp,addr=10.1.1.5'
> mount.nfs: prog 100003, trying vers=3, prot=6
> mount.nfs: portmap query failed: RPC: Program/version mismatch
> mount.nfs: Protocol not supported
>
> Signed-off-by: Jan Stancek <[email protected]>
Committed....

steved.

> ---
> src/clnt_vc.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/clnt_vc.c b/src/clnt_vc.c
> index 7769809..2eab9e4 100644
> --- a/src/clnt_vc.c
> +++ b/src/clnt_vc.c
> @@ -505,7 +505,7 @@ clnt_vc_control(cl, request, info)
> sigset_t newmask;
> int rpc_lock_value;
> u_int32_t tmp;
> - u_long ltmp;
> + u_int32_t ltmp;
>
> assert(cl != NULL);
>
>