Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77ba7877 authored by Al Viro's avatar Al Viro
Browse files

xfs: switch to proper __bitwise type for KM_... flags 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c217a2a0

fs/xfs/kmem.c

+5 −5
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize) 
}



void *

kmem_alloc(size_t size, unsigned int __nocast flags)

kmem_alloc(size_t size, xfs_km_flags_t flags)

{

	int	retries = 0;

	gfp_t	lflags = kmem_flags_convert(flags);
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags) 
}



void *

kmem_zalloc(size_t size, unsigned int __nocast flags)

kmem_zalloc(size_t size, xfs_km_flags_t flags)

{

	void	*ptr;
@@ -87,7 +87,7 @@ kmem_free(const void *ptr) 


void *

kmem_realloc(const void *ptr, size_t newsize, size_t oldsize,

	     unsigned int __nocast flags)

	     xfs_km_flags_t flags)

{

	void	*new;
@@ -102,7 +102,7 @@ kmem_realloc(const void *ptr, size_t newsize, size_t oldsize, 
}



void *

kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags)

kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags)

{

	int	retries = 0;

	gfp_t	lflags = kmem_flags_convert(flags);
@@ -121,7 +121,7 @@ kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags) 
}



void *

kmem_zone_zalloc(kmem_zone_t *zone, unsigned int __nocast flags)

kmem_zone_zalloc(kmem_zone_t *zone, xfs_km_flags_t flags)

{

	void	*ptr;

fs/xfs/kmem.h

+11 −10
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ 
 * General memory allocation interfaces

 */



#define KM_SLEEP	0x0001u

#define KM_NOSLEEP	0x0002u

#define KM_NOFS		0x0004u

#define KM_MAYFAIL	0x0008u

typedef unsigned __bitwise xfs_km_flags_t;

#define KM_SLEEP	((__force xfs_km_flags_t)0x0001u)

#define KM_NOSLEEP	((__force xfs_km_flags_t)0x0002u)

#define KM_NOFS		((__force xfs_km_flags_t)0x0004u)

#define KM_MAYFAIL	((__force xfs_km_flags_t)0x0008u)



/*

 * We use a special process flag to avoid recursive callbacks into
@@ -38,7 +39,7 @@ 
 * warnings, so we explicitly skip any generic ones (silly of us).

 */

static inline gfp_t

kmem_flags_convert(unsigned int __nocast flags)

kmem_flags_convert(xfs_km_flags_t flags)

{

	gfp_t	lflags;
@@ -54,9 +55,9 @@ kmem_flags_convert(unsigned int __nocast flags) 
	return lflags;

}



extern void *kmem_alloc(size_t, unsigned int __nocast);

extern void *kmem_zalloc(size_t, unsigned int __nocast);

extern void *kmem_realloc(const void *, size_t, size_t, unsigned int __nocast);

extern void *kmem_alloc(size_t, xfs_km_flags_t);

extern void *kmem_zalloc(size_t, xfs_km_flags_t);

extern void *kmem_realloc(const void *, size_t, size_t, xfs_km_flags_t);

extern void  kmem_free(const void *);



static inline void *kmem_zalloc_large(size_t size)
@@ -107,7 +108,7 @@ kmem_zone_destroy(kmem_zone_t *zone) 
		kmem_cache_destroy(zone);

}



extern void *kmem_zone_alloc(kmem_zone_t *, unsigned int __nocast);

extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast);

extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t);

extern void *kmem_zone_zalloc(kmem_zone_t *, xfs_km_flags_t);



#endif /* __XFS_SUPPORT_KMEM_H__ */

fs/xfs/xfs_log.c

+1 −1
Original line number Diff line number Diff line
@@ -3152,7 +3152,7 @@ xlog_ticket_alloc( 
	int		cnt,

	char		client,

	bool		permanent,

	int		alloc_flags)

	xfs_km_flags_t	alloc_flags)

{

	struct xlog_ticket *tic;

	uint		num_headers;

fs/xfs/xfs_log_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); 
extern kmem_zone_t *xfs_log_ticket_zone;

struct xlog_ticket *xlog_ticket_alloc(struct log *log, int unit_bytes,

				int count, char client, bool permanent,

				int alloc_flags);

				xfs_km_flags_t alloc_flags);





static inline void

fs/xfs/xfs_trans.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ xfs_trans_t * 
_xfs_trans_alloc(

	xfs_mount_t	*mp,

	uint		type,

	uint		memflags)

	xfs_km_flags_t	memflags)

{

	xfs_trans_t	*tp;