Commit 0bdcef54 authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

Merge branch 'slab/for-6.1/trivial' into slab/for-next 

Additional cleanup by Chao Yu removing a BUG_ON() in create_unique_id().
parents 5959725a d65360f2

mm/slub.c

+6 −3
Original line number Diff line number Diff line
@@ -5751,7 +5751,7 @@ static inline struct kset *cache_kset(struct kmem_cache *s) 
	return slab_kset;

}



#define ID_STR_LENGTH 64

#define ID_STR_LENGTH 32



/* Create a unique string id for a slab cache:

 *
@@ -5785,9 +5785,12 @@ static char *create_unique_id(struct kmem_cache *s) 
		*p++ = 'A';

	if (p != name + 1)

		*p++ = '-';

	p += sprintf(p, "%07u", s->size);

	p += snprintf(p, ID_STR_LENGTH - (p - name), "%07u", s->size);



	BUG_ON(p > name + ID_STR_LENGTH - 1);

	if (WARN_ON(p > name + ID_STR_LENGTH - 1)) {

		kfree(name);

		return ERR_PTR(-EINVAL);

	}

	return name;

}