Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752043AbdHFRHZ (ORCPT ); Sun, 6 Aug 2017 13:07:25 -0400 Received: from mail.kapsi.fi ([91.232.154.25]:56673 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751958AbdHFRHB (ORCPT ); Sun, 6 Aug 2017 13:07:01 -0400 From: Mikko Rapeli To: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Cc: Mikko Rapeli , Jan Harkes , codalist@TELEMANN.coda.cs.cmu.edu, coda@cs.cmu.edu Subject: [PATCH v06 23/36] uapi linux/coda.h: use __kernel_pid_t and add u_short etc definitions for userspace Date: Sun, 6 Aug 2017 18:44:14 +0200 Message-Id: <20170806164428.2273-24-mikko.rapeli@iki.fi> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170806164428.2273-1-mikko.rapeli@iki.fi> References: <20170806164428.2273-1-mikko.rapeli@iki.fi> X-SA-Exim-Connect-IP: 2003:6c:cd28:d400:219:d2ff:fe03:c7a9 X-SA-Exim-Mail-From: mikko.rapeli@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1181 Lines: 41 Fixes userspace compilation errors about unknown pid_t, u_short etc types. Signed-off-by: Mikko Rapeli Cc: Jan Harkes Cc: codalist@coda.cs.cmu.edu --- include/uapi/linux/coda.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h index 695fade33c64..2985ca00d63b 100644 --- a/include/uapi/linux/coda.h +++ b/include/uapi/linux/coda.h @@ -100,7 +100,14 @@ typedef unsigned long long u_quad_t; #if defined(__linux__) #include #define cdev_t u_quad_t + #ifndef __KERNEL__ +typedef unsigned long u_long; +typedef unsigned int u_int; +typedef unsigned short u_short; +typedef u_long ino_t; +typedef u_long dev_t; +typedef void *caddr_t; #if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2) #define _UQUAD_T_ 1 typedef unsigned long long u_quad_t; @@ -295,8 +302,8 @@ struct coda_statfs { struct coda_in_hdr { u_int32_t opcode; u_int32_t unique; /* Keep multiple outstanding msgs distinct */ - pid_t pid; - pid_t pgid; + __kernel_pid_t pid; + __kernel_pid_t pgid; vuid_t uid; }; -- 2.13.3