lkml.org 
[lkml]   [2015]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/19] staging/lustre: Remove references to OBD_ALLOC/FREE* in comments
    Date
    From: Oleg Drokin <green@linuxhacker.ru>

    Since everything is now supposed to use regular kernel alloc and
    free functions.

    Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
    ---
    drivers/staging/lustre/lustre/include/lustre_lib.h | 2 +-
    drivers/staging/lustre/lustre/include/lustre_net.h | 2 +-
    drivers/staging/lustre/lustre/llite/file.c | 2 +-
    drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 2 +-
    4 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h
    index 2a4294d..352e524 100644
    --- a/drivers/staging/lustre/lustre/include/lustre_lib.h
    +++ b/drivers/staging/lustre/lustre/include/lustre_lib.h
    @@ -453,7 +453,7 @@ static inline void obd_ioctl_freedata(char *buf, int len)
    * __wake_up_common(q, ...); (2.2)
    * spin_unlock(&q->lock, flags); (2.3)
    *
    - * OBD_FREE_PTR(obj); (3)
    + * kfree(obj); (3)
    *
    * As l_wait_event() may "short-cut" execution and return without taking
    * wait-queue spin-lock, some additional synchronization is necessary to
    diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
    index 3b6a2d7..c9c21d2 100644
    --- a/drivers/staging/lustre/lustre/include/lustre_net.h
    +++ b/drivers/staging/lustre/lustre/include/lustre_net.h
    @@ -306,7 +306,7 @@ union ptlrpc_async_args {
    /**
    * Scratchpad for passing args to completion interpreter. Users
    * cast to the struct of their choosing, and CLASSERT that this is
    - * big enough. For _tons_ of context, OBD_ALLOC a struct and store
    + * big enough. For _tons_ of context, kmalloc a struct and store
    * a pointer to it here. The pointer_arg ensures this struct is at
    * least big enough for that.
    */
    diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
    index b610032..31ed248 100644
    --- a/drivers/staging/lustre/lustre/llite/file.c
    +++ b/drivers/staging/lustre/lustre/llite/file.c
    @@ -694,7 +694,7 @@ out_och_free:
    if (rc) {
    if (och_p && *och_p) {
    kfree(*och_p);
    - *och_p = NULL; /* OBD_FREE writes some magic there */
    + *och_p = NULL;
    (*och_usecount)--;
    }
    mutex_unlock(&lli->lli_och_mutex);
    diff --git a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
    index 84eb3da..9a10baf 100644
    --- a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
    +++ b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
    @@ -1223,7 +1223,7 @@ int lprocfs_wr_evict_client(struct file *file, const char __user *buffer,
    return -ENOMEM;

    /*
    - * OBD_ALLOC() will zero kbuf, but we only copy BUFLEN - 1
    + * kzalloc() will zero kbuf, but we only copy BUFLEN - 1
    * bytes into kbuf, to ensure that the string is NUL-terminated.
    * UUID_MAX should include a trailing NUL already.
    */
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-09-16 02:41    [W:4.114 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site