lkml.org 
[lkml]   [2010]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 5/5] ntfs: remove dependency on __GFP_NOFAIL
    Reimplement ntfs_malloc_nofs_nofail() to loop forever calling
    ntfs_malloc_nofs() until the allocation succeeds.

    If the first allocation attempt fails, a warning will be emitted,
    including a call trace. Subsequent failures will suppress this warning.

    This was added as a helper function for documentation and auditability.
    No future callers should be added.

    Signed-off-by: David Rientjes <rientjes@google.com>
    ---
    fs/ntfs/malloc.h | 14 ++++++++++++--
    1 files changed, 12 insertions(+), 2 deletions(-)

    diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
    --- a/fs/ntfs/malloc.h
    +++ b/fs/ntfs/malloc.h
    @@ -76,11 +76,21 @@ static inline void *ntfs_malloc_nofs(unsigned long size)
    * This function guarantees that the allocation will succeed. It will sleep
    * for as long as it takes to complete the allocation.
    *
    - * If there was insufficient memory to complete the request, return NULL.
    + * NOTE: no new callers of this function should be implemented!
    + * All memory allocations should be failable whenever possible.
    */
    static inline void *ntfs_malloc_nofs_nofail(unsigned long size)
    {
    - return __ntfs_malloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_NOFAIL);
    + void *ret;
    +
    + for (;;) {
    + ret = ntfs_malloc_nofs(size);
    + if (ret)
    + return ret;
    + WARN_ONCE(1, "Out of memory, no fallback implemented "
    + "(size=%lu)\n",
    + size);
    + }
    }

    static inline void ntfs_free(void *addr)

    \
     
     \ /
      Last update: 2010-08-24 12:53    [W:0.025 / U:62.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site