lkml.org 
[lkml]   [2011]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/5] exec: unexport acct_arg_size() and get_arg_page()
    Unexport acct_arg_size() and get_arg_page(), fs/compat.c doesn't
    need them any longer.

    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    ---

    include/linux/binfmts.h | 4 ----
    fs/exec.c | 8 ++++----
    2 files changed, 4 insertions(+), 8 deletions(-)

    --- 38/include/linux/binfmts.h~4_unexport_arg_helpers 2011-02-25 18:01:57.000000000 +0100
    +++ 38/include/linux/binfmts.h 2011-02-25 18:05:27.000000000 +0100
    @@ -60,10 +60,6 @@ struct linux_binprm {
    unsigned long loader, exec;
    };

    -extern void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
    -extern struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
    - int write);
    -
    #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
    #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)

    --- 38/fs/exec.c~4_unexport_arg_helpers 2011-02-25 18:05:17.000000000 +0100
    +++ 38/fs/exec.c 2011-02-25 18:05:27.000000000 +0100
    @@ -165,7 +165,7 @@ out:

    #ifdef CONFIG_MMU

    -void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
    +static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
    {
    struct mm_struct *mm = current->mm;
    long diff = (long)(pages - bprm->vma_pages);
    @@ -184,7 +184,7 @@ void acct_arg_size(struct linux_binprm *
    #endif
    }

    -struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
    +static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
    int write)
    {
    struct page *page;
    @@ -303,11 +303,11 @@ static bool valid_arg_len(struct linux_b

    #else

    -void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
    +static inline void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
    {
    }

    -struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
    +static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
    int write)
    {
    struct page *page;


    \
     
     \ /
      Last update: 2011-02-25 19:05    [W:0.020 / U:61.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site