Removes the dependency on __GFP_NOFAIL by looping indefinitely in the
caller.
Instead of maintaining a seperate _nofail() variant, it's possible to
remove it and use ntfs_malloc_nofs() instead.
Signed-off-by: David Rientjes <rientjes@google.com>
---
fs/ntfs/malloc.h | 17 -----------------
fs/ntfs/runlist.c | 6 ++++--
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
--- a/fs/ntfs/malloc.h
+++ b/fs/ntfs/malloc.h
@@ -66,23 +66,6 @@ static inline void *ntfs_malloc_nofs(unsigned long size)
return __ntfs_malloc(size, GFP_NOFS | __GFP_HIGHMEM);
}
-/**
- * ntfs_malloc_nofs_nofail - allocate memory in multiples of pages
- * @size: number of bytes to allocate
- *
- * Allocates @size bytes of memory, rounded up to multiples of PAGE_SIZE and
- * returns a pointer to the allocated memory.
- *
- * 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.
- */
-static inline void *ntfs_malloc_nofs_nofail(unsigned long size)
-{
- return __ntfs_malloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_NOFAIL);
-}
-
static inline void ntfs_free(void *addr)
{
if (!is_vmalloc_addr(addr)) {
diff --git a/fs/ntfs/runlist.c b/fs/ntfs/runlist.c
--- a/fs/ntfs/runlist.c
+++ b/fs/ntfs/runlist.c
@@ -127,8 +127,10 @@ static inline runlist_element *ntfs_rl_realloc_nofail(runlist_element *rl,
if (old_size == new_size)
return rl;
- new_rl = ntfs_malloc_nofs_nofail(new_size);
- BUG_ON(!new_rl);
+ do {
+ /* FIXME: this may potentially loop forever */
+ new_rl = ntfs_malloc_nofs(new_size);
+ } while (!new_rl);
if (likely(rl != NULL)) {
if (unlikely(old_size > new_size))
--
