| Message ID | 20191113142335.1045631-11-cmaiolino@redhat.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | Use generic memory API instead of a custom one | expand |
On Wed, Nov 13, 2019 at 03:23:34PM +0100, Carlos Maiolino wrote: > We now use slab flags directly, so get rid of KM_flags and the > kmem_flags_convert() function. > > Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/kmem.h | 37 ------------------------------------- > 1 file changed, 37 deletions(-) > > diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h > index 9249323567ce..791e770be0eb 100644 > --- a/fs/xfs/kmem.h > +++ b/fs/xfs/kmem.h > @@ -15,43 +15,6 @@ > * General memory allocation interfaces > */ > > -typedef unsigned __bitwise xfs_km_flags_t; > -#define KM_NOFS ((__force xfs_km_flags_t)0x0004u) > -#define KM_MAYFAIL ((__force xfs_km_flags_t)0x0008u) > -#define KM_ZERO ((__force xfs_km_flags_t)0x0010u) > - > -/* > - * We use a special process flag to avoid recursive callbacks into > - * the filesystem during transactions. We will also issue our own > - * warnings, so we explicitly skip any generic ones (silly of us). > - */ > -static inline gfp_t > -kmem_flags_convert(xfs_km_flags_t flags) > -{ > - gfp_t lflags; > - > - BUG_ON(flags & ~(KM_NOFS|KM_MAYFAIL|KM_ZERO)); > - > - lflags = GFP_KERNEL | __GFP_NOWARN; > - if (flags & KM_NOFS) > - lflags &= ~__GFP_FS; > - > - /* > - * Default page/slab allocator behavior is to retry for ever > - * for small allocations. We can override this behavior by using > - * __GFP_RETRY_MAYFAIL which will tell the allocator to retry as long > - * as it is feasible but rather fail than retry forever for all > - * request sizes. > - */ > - if (flags & KM_MAYFAIL) > - lflags |= __GFP_RETRY_MAYFAIL; > - > - if (flags & KM_ZERO) > - lflags |= __GFP_ZERO; > - > - return lflags; > -} > - > extern void *kmem_alloc_io(size_t size, int align_mask, gfp_t flags); > extern void *kmem_alloc_large(size_t size, gfp_t); > static inline void kmem_free(const void *ptr) > -- > 2.23.0 >
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index 9249323567ce..791e770be0eb 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h @@ -15,43 +15,6 @@ * General memory allocation interfaces */ -typedef unsigned __bitwise xfs_km_flags_t; -#define KM_NOFS ((__force xfs_km_flags_t)0x0004u) -#define KM_MAYFAIL ((__force xfs_km_flags_t)0x0008u) -#define KM_ZERO ((__force xfs_km_flags_t)0x0010u) - -/* - * We use a special process flag to avoid recursive callbacks into - * the filesystem during transactions. We will also issue our own - * warnings, so we explicitly skip any generic ones (silly of us). - */ -static inline gfp_t -kmem_flags_convert(xfs_km_flags_t flags) -{ - gfp_t lflags; - - BUG_ON(flags & ~(KM_NOFS|KM_MAYFAIL|KM_ZERO)); - - lflags = GFP_KERNEL | __GFP_NOWARN; - if (flags & KM_NOFS) - lflags &= ~__GFP_FS; - - /* - * Default page/slab allocator behavior is to retry for ever - * for small allocations. We can override this behavior by using - * __GFP_RETRY_MAYFAIL which will tell the allocator to retry as long - * as it is feasible but rather fail than retry forever for all - * request sizes. - */ - if (flags & KM_MAYFAIL) - lflags |= __GFP_RETRY_MAYFAIL; - - if (flags & KM_ZERO) - lflags |= __GFP_ZERO; - - return lflags; -} - extern void *kmem_alloc_io(size_t size, int align_mask, gfp_t flags); extern void *kmem_alloc_large(size_t size, gfp_t); static inline void kmem_free(const void *ptr)
We now use slab flags directly, so get rid of KM_flags and the kmem_flags_convert() function. Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> --- fs/xfs/kmem.h | 37 ------------------------------------- 1 file changed, 37 deletions(-)