[PATCH] gfp_t: fs/*
- ->releasepage() annotated (s/int/gfp_t), instances updated - missing gfp_t in fs/* added - fixed misannotation from the original sweep caught by bitwise checks: XFS used __nocast both for gfp_t and for flags used by XFS allocator. The latter left with unsigned int __nocast; we might want to add a different type for those but for now let's leave them alone. That, BTW, is a case when __nocast use had been actively confusing - it had been used in the same code for two different and similar types, with no way to catch misuses. Switch of gfp_t to bitwise had caught that immediately... One tricky bit is left alone to be dealt with later - mapping->flags is a mix of gfp_t and error indications. Left alone for now. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
@@ -45,11 +45,11 @@
|
||||
|
||||
|
||||
void *
|
||||
kmem_alloc(size_t size, gfp_t flags)
|
||||
kmem_alloc(size_t size, unsigned int __nocast flags)
|
||||
{
|
||||
int retries = 0;
|
||||
unsigned int lflags = kmem_flags_convert(flags);
|
||||
void *ptr;
|
||||
int retries = 0;
|
||||
gfp_t lflags = kmem_flags_convert(flags);
|
||||
void *ptr;
|
||||
|
||||
do {
|
||||
if (size < MAX_SLAB_SIZE || retries > MAX_VMALLOCS)
|
||||
@@ -67,7 +67,7 @@ kmem_alloc(size_t size, gfp_t flags)
|
||||
}
|
||||
|
||||
void *
|
||||
kmem_zalloc(size_t size, gfp_t flags)
|
||||
kmem_zalloc(size_t size, unsigned int __nocast flags)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
@@ -90,7 +90,7 @@ kmem_free(void *ptr, size_t size)
|
||||
|
||||
void *
|
||||
kmem_realloc(void *ptr, size_t newsize, size_t oldsize,
|
||||
gfp_t flags)
|
||||
unsigned int __nocast flags)
|
||||
{
|
||||
void *new;
|
||||
|
||||
@@ -105,11 +105,11 @@ kmem_realloc(void *ptr, size_t newsize, size_t oldsize,
|
||||
}
|
||||
|
||||
void *
|
||||
kmem_zone_alloc(kmem_zone_t *zone, gfp_t flags)
|
||||
kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags)
|
||||
{
|
||||
int retries = 0;
|
||||
unsigned int lflags = kmem_flags_convert(flags);
|
||||
void *ptr;
|
||||
int retries = 0;
|
||||
gfp_t lflags = kmem_flags_convert(flags);
|
||||
void *ptr;
|
||||
|
||||
do {
|
||||
ptr = kmem_cache_alloc(zone, lflags);
|
||||
@@ -124,7 +124,7 @@ kmem_zone_alloc(kmem_zone_t *zone, gfp_t flags)
|
||||
}
|
||||
|
||||
void *
|
||||
kmem_zone_zalloc(kmem_zone_t *zone, gfp_t flags)
|
||||
kmem_zone_zalloc(kmem_zone_t *zone, unsigned int __nocast flags)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
|
Reference in New Issue
Block a user