lkml.org 
[lkml]   [2019]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 21/42] uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers
    Date
    [ Upstream commit f90fb3c7e2c13ae829db2274b88b845a75038b8a ]

    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 <jaharkes@cs.cmu.edu> in
    https://lore.kernel.org/lkml/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 */
    ^

    Link: http://lkml.kernel.org/r/9f99f5ce6a0563d5266e6cf7aa9585aac2cae971.1558117389.git.jaharkes@cs.cmu.edu
    Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
    Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Colin Ian King <colin.king@canonical.com>
    Cc: Dan Carpenter <dan.carpenter@oracle.com>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Fabian Frederick <fabf@skynet.be>
    Cc: Sam Protsenko <semen.protsenko@linaro.org>
    Cc: Yann Droneaud <ydroneaud@opteya.com>
    Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 5b8721efa948e..fe1466daf2918 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 79d05981fc4b0..e2c44d2f7d5bd 100644
    --- a/include/uapi/linux/coda_psdev.h
    +++ b/include/uapi/linux/coda_psdev.h
    @@ -6,19 +6,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


    \
     
     \ /
      Last update: 2019-08-05 15:17    [W:3.331 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site