lkml.org 
[lkml]   [2012]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv4 3/3] fs: Update coredump-related headers
    Date
    This patch creates a new header file, fs/coredump.h, which contains
    functions only used by the new coredump.c. It also moves do_coredump
    to the include/linux/coredump.h header file, for consistency.

    Signed-off-by: Alex Kelly <alex.page.kelly@gmail.com>
    Reviewed-by: Josh Triplett <josh@joshtriplett.org>
    ---
    fs/coredump.c | 2 ++
    fs/coredump.h | 6 ++++++
    fs/exec.c | 1 +
    include/linux/binfmts.h | 5 -----
    include/linux/coredump.h | 5 +++++
    include/linux/sched.h | 1 -
    kernel/signal.c | 1 +
    7 files changed, 15 insertions(+), 6 deletions(-)
    create mode 100644 fs/coredump.h

    diff --git a/fs/coredump.c b/fs/coredump.c
    index 9692329..1935b4d 100644
    --- a/fs/coredump.c
    +++ b/fs/coredump.c
    @@ -14,6 +14,7 @@
    #include <linux/key.h>
    #include <linux/personality.h>
    #include <linux/binfmts.h>
    +#include <linux/coredump.h>
    #include <linux/utsname.h>
    #include <linux/pid_namespace.h>
    #include <linux/module.h>
    @@ -39,6 +40,7 @@

    #include <trace/events/task.h>
    #include "internal.h"
    +#include "coredump.h"

    #include <trace/events/sched.h>

    diff --git a/fs/coredump.h b/fs/coredump.h
    new file mode 100644
    index 0000000..e39ff07
    --- /dev/null
    +++ b/fs/coredump.h
    @@ -0,0 +1,6 @@
    +#ifndef _FS_COREDUMP_H
    +#define _FS_COREDUMP_H
    +
    +extern int __get_dumpable(unsigned long mm_flags);
    +
    +#endif
    diff --git a/fs/exec.c b/fs/exec.c
    index b604050..a0ad3a2 100644
    --- a/fs/exec.c
    +++ b/fs/exec.c
    @@ -63,6 +63,7 @@

    #include <trace/events/task.h>
    #include "internal.h"
    +#include "coredump.h"

    #include <trace/events/sched.h>

    diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
    index 00e2e89..c7b16ee 100644
    --- a/include/linux/binfmts.h
    +++ b/include/linux/binfmts.h
    @@ -132,11 +132,6 @@ extern int copy_strings_kernel(int argc, const char *const *argv,
    struct linux_binprm *bprm);
    extern int prepare_bprm_creds(struct linux_binprm *bprm);
    extern void install_exec_creds(struct linux_binprm *bprm);
    -#ifdef CONFIG_COREDUMP
    -extern void do_coredump(long signr, int exit_code, struct pt_regs *regs);
    -#else
    -static inline void do_coredump(long signr, int exit_code, struct pt_regs *regs) {}
    -#endif
    extern void set_binfmt(struct linux_binfmt *new);
    extern void free_bprm(struct linux_binprm *);

    diff --git a/include/linux/coredump.h b/include/linux/coredump.h
    index ba4b85a..42f9752 100644
    --- a/include/linux/coredump.h
    +++ b/include/linux/coredump.h
    @@ -11,5 +11,10 @@
    */
    extern int dump_write(struct file *file, const void *addr, int nr);
    extern int dump_seek(struct file *file, loff_t off);
    +#ifdef CONFIG_COREDUMP
    +extern void do_coredump(long signr, int exit_code, struct pt_regs *regs);
    +#else
    +static inline void do_coredump(long signr, int exit_code, struct pt_regs *regs) {}
    +#endif

    #endif /* _LINUX_COREDUMP_H */
    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index 7bb5047..c147e70 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -413,7 +413,6 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}

    extern void set_dumpable(struct mm_struct *mm, int value);
    extern int get_dumpable(struct mm_struct *mm);
    -extern int __get_dumpable(unsigned long mm_flags);

    /* get/set_dumpable() values */
    #define SUID_DUMPABLE_DISABLED 0
    diff --git a/kernel/signal.c b/kernel/signal.c
    index be4f856..fb4fd72 100644
    --- a/kernel/signal.c
    +++ b/kernel/signal.c
    @@ -17,6 +17,7 @@
    #include <linux/fs.h>
    #include <linux/tty.h>
    #include <linux/binfmts.h>
    +#include <linux/coredump.h>
    #include <linux/security.h>
    #include <linux/syscalls.h>
    #include <linux/ptrace.h>
    --
    1.7.11.2


    \
     
     \ /
      Last update: 2012-08-10 11:02    [W:0.028 / U:30.648 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site