From patchwork Thu May 16 20:25:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Stancek X-Patchwork-Id: 2579851 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5891D3FE1F for ; Thu, 16 May 2013 20:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751164Ab3EPUZc (ORCPT ); Thu, 16 May 2013 16:25:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7887 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025Ab3EPUZc (ORCPT ); Thu, 16 May 2013 16:25:32 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4GKPOBJ023136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 May 2013 16:25:24 -0400 Received: from dustball.brq.redhat.com (dustball.brq.redhat.com [10.34.26.57]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r4GKPMKt024993; Thu, 16 May 2013 16:25:23 -0400 From: Jan Stancek To: libtirpc-devel@lists.sourceforge.net Cc: linux-nfs@vger.kernel.org, steved@redhat.com Subject: [PATCH] clnt_vc_control: fix VERS/PROG size Date: Thu, 16 May 2013 22:25:19 +0200 Message-Id: <6ed8842bb155fce40f3bb9283ba28e28c6432156.1368735469.git.jstancek@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org 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 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 --- 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);