lkml.org 
[lkml]   [2012]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v11 03/12] seccomp: kill the seccomp_t typedef
    Date
    Replaces the seccomp_t typedef with struct seccomp to match modern
    kernel style.

    v8-v11: no changes
    v7: struct seccomp_struct -> struct seccomp
    v6: original inclusion in this series.

    Signed-off-by: Will Drewry <wad@chromium.org>
    Reviewed-by: James Morris <jmorris@namei.org>
    ---
    include/linux/sched.h | 2 +-
    include/linux/seccomp.h | 10 ++++++----
    2 files changed, 7 insertions(+), 5 deletions(-)
    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index 7d379a6..c30526f 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -1418,7 +1418,7 @@ struct task_struct {
    uid_t loginuid;
    unsigned int sessionid;
    #endif
    - seccomp_t seccomp;
    + struct seccomp seccomp;

    /* Thread group tracking */
    u32 parent_exec_id;
    diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
    index cc7a4e9..d61f27f 100644
    --- a/include/linux/seccomp.h
    +++ b/include/linux/seccomp.h
    @@ -7,7 +7,9 @@
    #include <linux/thread_info.h>
    #include <asm/seccomp.h>

    -typedef struct { int mode; } seccomp_t;
    +struct seccomp {
    + int mode;
    +};

    extern void __secure_computing(int);
    static inline void secure_computing(int this_syscall)
    @@ -19,7 +21,7 @@ static inline void secure_computing(int this_syscall)
    extern long prctl_get_seccomp(void);
    extern long prctl_set_seccomp(unsigned long);

    -static inline int seccomp_mode(seccomp_t *s)
    +static inline int seccomp_mode(struct seccomp *s)
    {
    return s->mode;
    }
    @@ -28,7 +30,7 @@ static inline int seccomp_mode(seccomp_t *s)

    #include <linux/errno.h>

    -typedef struct { } seccomp_t;
    +struct seccomp { };

    #define secure_computing(x) do { } while (0)

    @@ -42,7 +44,7 @@ static inline long prctl_set_seccomp(unsigned long arg2)
    return -EINVAL;
    }

    -static inline int seccomp_mode(seccomp_t *s)
    +static inline int seccomp_mode(struct seccomp *s)
    {
    return 0;
    }
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-02-25 04:25    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean