Commit 46385326 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

bitmap, cpumask, nodemask: remove dedicated formatting functions 



Now that all bitmap formatting usages have been converted to
'%*pb[l]', the separate formatting functions are unnecessary.  The
following functions are removed.

* bitmap_scn[list]printf()
* cpumask_scnprintf(), cpulist_scnprintf()
* [__]nodemask_scnprintf(), [__]nodelist_scnprintf()
* seq_bitmap[_list](), seq_cpumask[_list](), seq_nodemask[_list]()
* seq_buf_bitmask()

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ccbd59c1

fs/seq_file.c

+0 −32
Original line number Diff line number Diff line
@@ -539,38 +539,6 @@ int seq_dentry(struct seq_file *m, struct dentry *dentry, const char *esc) 
	return res;

}



int seq_bitmap(struct seq_file *m, const unsigned long *bits,

				   unsigned int nr_bits)

{

	if (m->count < m->size) {

		int len = bitmap_scnprintf(m->buf + m->count,

				m->size - m->count, bits, nr_bits);

		if (m->count + len < m->size) {

			m->count += len;

			return 0;

		}

	}

	seq_set_overflow(m);

	return -1;

}

EXPORT_SYMBOL(seq_bitmap);



int seq_bitmap_list(struct seq_file *m, const unsigned long *bits,

		unsigned int nr_bits)

{

	if (m->count < m->size) {

		int len = bitmap_scnlistprintf(m->buf + m->count,

				m->size - m->count, bits, nr_bits);

		if (m->count + len < m->size) {

			m->count += len;

			return 0;

		}

	}

	seq_set_overflow(m);

	return -1;

}

EXPORT_SYMBOL(seq_bitmap_list);



static void *single_start(struct seq_file *p, loff_t *pos)

{

	return NULL + (*pos == 0);

include/linux/bitmap.h

+0 −7
Original line number Diff line number Diff line
@@ -52,16 +52,13 @@ 
 * bitmap_bitremap(oldbit, old, new, nbits)	newbit = map(old, new)(oldbit)

 * bitmap_onto(dst, orig, relmap, nbits)	*dst = orig relative to relmap

 * bitmap_fold(dst, orig, sz, nbits)		dst bits = orig bits mod sz

 * bitmap_scnprintf(buf, len, src, nbits)	Print bitmap src to buf

 * bitmap_parse(buf, buflen, dst, nbits)	Parse bitmap dst from kernel buf

 * bitmap_parse_user(ubuf, ulen, dst, nbits)	Parse bitmap dst from user buf

 * bitmap_scnlistprintf(buf, len, src, nbits)	Print bitmap src as list to buf

 * bitmap_parselist(buf, dst, nbits)		Parse bitmap dst from kernel buf

 * bitmap_parselist_user(buf, dst, nbits)	Parse bitmap dst from user buf

 * bitmap_find_free_region(bitmap, bits, order)	Find and allocate bit region

 * bitmap_release_region(bitmap, pos, order)	Free specified bit region

 * bitmap_allocate_region(bitmap, pos, order)	Allocate specified bit region

 * bitmap_print_to_pagebuf(list, buf, mask, nbits) Print bitmap src as list/hex

 */



/*
@@ -147,14 +144,10 @@ bitmap_find_next_zero_area(unsigned long *map, 
					      align_mask, 0);

}



extern int bitmap_scnprintf(char *buf, unsigned int len,

			const unsigned long *src, int nbits);

extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user,

			unsigned long *dst, int nbits);

extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen,

			unsigned long *dst, int nbits);

extern int bitmap_scnlistprintf(char *buf, unsigned int len,

			const unsigned long *src, int nbits);

extern int bitmap_parselist(const char *buf, unsigned long *maskp,

			int nmaskbits);

extern int bitmap_parselist_user(const char __user *ubuf, unsigned int ulen,

include/linux/cpumask.h

+0 −31
Original line number Diff line number Diff line
@@ -546,21 +546,6 @@ static inline void cpumask_copy(struct cpumask *dstp, 
 */

#define cpumask_of(cpu) (get_cpu_mask(cpu))



/**

 * cpumask_scnprintf - print a cpumask into a string as comma-separated hex

 * @buf: the buffer to sprintf into

 * @len: the length of the buffer

 * @srcp: the cpumask to print

 *

 * If len is zero, returns zero.  Otherwise returns the length of the

 * (nul-terminated) @buf string.

 */

static inline int cpumask_scnprintf(char *buf, int len,

				    const struct cpumask *srcp)

{

	return bitmap_scnprintf(buf, len, cpumask_bits(srcp), nr_cpu_ids);

}



/**

 * cpumask_parse_user - extract a cpumask from a user string

 * @buf: the buffer to extract from
@@ -590,22 +575,6 @@ static inline int cpumask_parselist_user(const char __user *buf, int len, 
				     nr_cpu_ids);

}



/**

 * cpulist_scnprintf - print a cpumask into a string as comma-separated list

 * @buf: the buffer to sprintf into

 * @len: the length of the buffer

 * @srcp: the cpumask to print

 *

 * If len is zero, returns zero.  Otherwise returns the length of the

 * (nul-terminated) @buf string.

 */

static inline int cpulist_scnprintf(char *buf, int len,

				    const struct cpumask *srcp)

{

	return bitmap_scnlistprintf(buf, len, cpumask_bits(srcp),

				    nr_cpu_ids);

}



/**

 * cpumask_parse - extract a cpumask from from a string

 * @buf: the buffer to extract from

include/linux/nodemask.h

+7 −26
Original line number Diff line number Diff line
@@ -8,14 +8,13 @@ 
 * See detailed comments in the file linux/bitmap.h describing the

 * data type on which these nodemasks are based.

 *

 * For details of nodemask_scnprintf() and nodemask_parse_user(),

 * see bitmap_scnprintf() and bitmap_parse_user() in lib/bitmap.c.

 * For details of nodelist_scnprintf() and nodelist_parse(), see

 * bitmap_scnlistprintf() and bitmap_parselist(), also in bitmap.c.

 * For details of node_remap(), see bitmap_bitremap in lib/bitmap.c.

 * For details of nodes_remap(), see bitmap_remap in lib/bitmap.c.

 * For details of nodes_onto(), see bitmap_onto in lib/bitmap.c.

 * For details of nodes_fold(), see bitmap_fold in lib/bitmap.c.

 * For details of nodemask_parse_user(), see bitmap_parse_user() in

 * lib/bitmap.c.  For details of nodelist_parse(), see bitmap_parselist(),

 * also in bitmap.c.  For details of node_remap(), see bitmap_bitremap in

 * lib/bitmap.c.  For details of nodes_remap(), see bitmap_remap in

 * lib/bitmap.c.  For details of nodes_onto(), see bitmap_onto in

 * lib/bitmap.c.  For details of nodes_fold(), see bitmap_fold in

 * lib/bitmap.c.

 *

 * The available nodemask operations are:

 *
@@ -52,9 +51,7 @@ 
 * NODE_MASK_NONE			Initializer - no bits set

 * unsigned long *nodes_addr(mask)	Array of unsigned long's in mask

 *

 * int nodemask_scnprintf(buf, len, mask) Format nodemask for printing

 * int nodemask_parse_user(ubuf, ulen, mask)	Parse ascii string as nodemask

 * int nodelist_scnprintf(buf, len, mask) Format nodemask as list for printing

 * int nodelist_parse(buf, map)		Parse ascii string as nodelist

 * int node_remap(oldbit, old, new)	newbit = map(old, new)(oldbit)

 * void nodes_remap(dst, src, old, new)	*dst = map(old, new)(src)
@@ -312,14 +309,6 @@ static inline int __first_unset_node(const nodemask_t *maskp) 


#define nodes_addr(src) ((src).bits)



#define nodemask_scnprintf(buf, len, src) \

			__nodemask_scnprintf((buf), (len), &(src), MAX_NUMNODES)

static inline int __nodemask_scnprintf(char *buf, int len,

					const nodemask_t *srcp, int nbits)

{

	return bitmap_scnprintf(buf, len, srcp->bits, nbits);

}



#define nodemask_parse_user(ubuf, ulen, dst) \

		__nodemask_parse_user((ubuf), (ulen), &(dst), MAX_NUMNODES)

static inline int __nodemask_parse_user(const char __user *buf, int len,
@@ -328,14 +317,6 @@ static inline int __nodemask_parse_user(const char __user *buf, int len, 
	return bitmap_parse_user(buf, len, dstp->bits, nbits);

}



#define nodelist_scnprintf(buf, len, src) \

			__nodelist_scnprintf((buf), (len), &(src), MAX_NUMNODES)

static inline int __nodelist_scnprintf(char *buf, int len,

					const nodemask_t *srcp, int nbits)

{

	return bitmap_scnlistprintf(buf, len, srcp->bits, nbits);

}



#define nodelist_parse(buf, dst) __nodelist_parse((buf), &(dst), MAX_NUMNODES)

static inline int __nodelist_parse(const char *buf, nodemask_t *dstp, int nbits)

{

include/linux/seq_buf.h

+0 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ extern int seq_buf_putmem_hex(struct seq_buf *s, const void *mem, 
			      unsigned int len);

extern int seq_buf_path(struct seq_buf *s, const struct path *path, const char *esc);



extern int seq_buf_bitmask(struct seq_buf *s, const unsigned long *maskp,

			   int nmaskbits);



#ifdef CONFIG_BINARY_PRINTF

extern int

seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary);

CRA Git | Maintained and supported by SUSTech CRA and CCSE