lkml.org 
[lkml]   [2011]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 027/260] CIFS: Remove __exit mark from cifs_exit_dns_resolver()
    Date
    From: David Howells <dhowells@redhat.com>

    commit 51c20fcced5badee0e2021c6c89f44aa3cbd72aa upstream.

    Remove the __exit mark from cifs_exit_dns_resolver() as it's called by the
    module init routine in case of error, and so may have been discarded during
    linkage.

    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    fs/cifs/dns_resolve.c | 2 +-
    fs/cifs/dns_resolve.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c
    index 4a4bbde..56316ae 100644
    --- a/fs/cifs/dns_resolve.c
    +++ b/fs/cifs/dns_resolve.c
    @@ -227,7 +227,7 @@ failed_put_cred:
    return ret;
    }

    -void __exit cifs_exit_dns_resolver(void)
    +void cifs_exit_dns_resolver(void)
    {
    key_revoke(dns_resolver_cache->thread_keyring);
    unregister_key_type(&key_type_dns_resolver);
    diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h
    index 26b9eaa..5d7f291 100644
    --- a/fs/cifs/dns_resolve.h
    +++ b/fs/cifs/dns_resolve.h
    @@ -25,7 +25,7 @@

    #ifdef __KERNEL__
    extern int __init cifs_init_dns_resolver(void);
    -extern void __exit cifs_exit_dns_resolver(void);
    +extern void cifs_exit_dns_resolver(void);
    extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);
    #endif /* KERNEL */

    --
    1.7.3.3


    \
     
     \ /
      Last update: 2011-01-02 09:15    [W:0.023 / U:0.036 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site