From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0179FC10F05 for ; Wed, 20 Mar 2019 17:28:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8B3121841 for ; Wed, 20 Mar 2019 17:28:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727099AbfCTR2T (ORCPT ); Wed, 20 Mar 2019 13:28:19 -0400 Received: from hurricane.elijah.cs.cmu.edu ([128.2.209.191]:46704 "EHLO hurricane.elijah.cs.cmu.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726802AbfCTR2S (ORCPT ); Wed, 20 Mar 2019 13:28:18 -0400 Received: from jaharkes by hurricane.elijah.cs.cmu.edu with local (Exim 4.92) (envelope-from ) id 1h6eLV-0006la-54; Wed, 20 Mar 2019 12:45:41 -0400 From: Jan Harkes To: Andrew Morton Cc: Jan Harkes , linux-fsdevel@vger.kernel.org, Mikko Rapeli Subject: [PATCH 02/22] uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers Date: Wed, 20 Mar 2019 12:45:21 -0400 Message-Id: <3f1aa298d95067e064b872383f63e24d838d23cf.1553098575.git.jaharkes@cs.cmu.edu> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Mikko Rapeli Only users of upc_req in kernel side fs/coda/psdev.c and fs/coda/upcall.c already include linux/coda_psdev.h. Suggested by Jan Harkes on lkml message <20150531111913.GA23377@cs.cmu.edu>. Fixes these include/uapi/linux/coda_psdev.h compilation errors in userspace: ./linux/coda_psdev.h:12:19: error: field ‘uc_chain’ has incomplete type struct list_head uc_chain; ^ ./linux/coda_psdev.h:13:2: error: unknown type name ‘caddr_t’ caddr_t uc_data; ^ ./linux/coda_psdev.h:14:2: error: unknown type name ‘u_short’ u_short uc_flags; ^ ./linux/coda_psdev.h:15:2: error: unknown type name ‘u_short’ u_short uc_inSize; /* Size is at most 5000 bytes */ ^ ./linux/coda_psdev.h:16:2: error: unknown type name ‘u_short’ u_short uc_outSize; ^ ./linux/coda_psdev.h:17:2: error: unknown type name ‘u_short’ u_short uc_opcode; /* copied from data to save lookup */ ^ ./linux/coda_psdev.h:19:2: error: unknown type name ‘wait_queue_head_t’ wait_queue_head_t uc_sleep; /* process' wait queue */ ^ Signed-off-by: Mikko Rapeli Cc: coda@cs.cmu.edu Cc: Jan Harkes Signed-off-by: Jan Harkes --- include/linux/coda_psdev.h | 11 +++++++++++ include/uapi/linux/coda_psdev.h | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h index 15170954aa2b..57d2b2faf6a3 100644 --- a/include/linux/coda_psdev.h +++ b/include/linux/coda_psdev.h @@ -19,6 +19,17 @@ struct venus_comm { struct mutex vc_mutex; }; +/* messages between coda filesystem in kernel and Venus */ +struct upc_req { + struct list_head uc_chain; + caddr_t uc_data; + u_short uc_flags; + u_short uc_inSize; /* Size is at most 5000 bytes */ + u_short uc_outSize; + u_short uc_opcode; /* copied from data to save lookup */ + int uc_unique; + wait_queue_head_t uc_sleep; /* process' wait queue */ +}; static inline struct venus_comm *coda_vcp(struct super_block *sb) { diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h index aa6623efd2dd..d50d51a57fe4 100644 --- a/include/uapi/linux/coda_psdev.h +++ b/include/uapi/linux/coda_psdev.h @@ -7,19 +7,6 @@ #define CODA_PSDEV_MAJOR 67 #define MAX_CODADEVS 5 /* how many do we allow */ - -/* messages between coda filesystem in kernel and Venus */ -struct upc_req { - struct list_head uc_chain; - caddr_t uc_data; - u_short uc_flags; - u_short uc_inSize; /* Size is at most 5000 bytes */ - u_short uc_outSize; - u_short uc_opcode; /* copied from data to save lookup */ - int uc_unique; - wait_queue_head_t uc_sleep; /* process' wait queue */ -}; - #define CODA_REQ_ASYNC 0x1 #define CODA_REQ_READ 0x2 #define CODA_REQ_WRITE 0x4 -- 2.20.1