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

Commit 5c7566a2 authored by Amit Pundir's avatar Amit Pundir Committed by John Stultz
Browse files

misc seq_printf fixes for 4.4 



Update seq_printf() usage in aosp patches to align
with changes from mainline commit 6798a8ca
"fs/seq_file: convert int seq_vprint/seq_printf/etc...
returns to void".

Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent fccab646

drivers/misc/uid_stat.c

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ static int uid_stat_atomic_int_show(struct seq_file *m, void *v) 
	atomic_t *counter = m->private;



	bytes = (unsigned int) (atomic_read(counter) + INT_MIN);

	return seq_printf(m, "%u\n", bytes);

	seq_printf(m, "%u\n", bytes);

	return seq_has_overflowed(m) ? -ENOSPC : 0;

}



static int uid_stat_read_atomic_int_open(struct inode *inode, struct file *file)

net/activity_stats.c

+3 −4
Original line number Diff line number Diff line
@@ -63,14 +63,13 @@ void activity_stats_update(void) 
static int activity_stats_show(struct seq_file *m, void *v)

{

	int i;

	int ret;



	seq_printf(m, "Min Bucket(sec) Count\n");



	for (i = 0; i < BUCKET_MAX; i++) {

		ret = seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);

		if (ret)

			return ret;

		seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);

		if (seq_has_overflowed(m))

			return -ENOSPC;

	}



	return 0;

net/netfilter/xt_qtaguid.c

+2 −3
Original line number Diff line number Diff line
@@ -2543,7 +2543,6 @@ static void pp_stats_header(struct seq_file *m) 
static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry,

			 int cnt_set)

{

	int ret;

	struct data_counters *cnts;

	tag_t tag = ts_entry->tn.tag;

	uid_t stat_uid = get_uid_from_tag(tag);
@@ -2562,7 +2561,7 @@ static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry, 
	}

	ppi->item_index++;

	cnts = &ts_entry->counters;

	ret = seq_printf(m, "%d %s 0x%llx %u %u "

	seq_printf(m, "%d %s 0x%llx %u %u "

		"%llu %llu "

		"%llu %llu "

		"%llu %llu "
@@ -2592,7 +2591,7 @@ static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry, 
		cnts->bpc[cnt_set][IFS_TX][IFS_UDP].packets,

		cnts->bpc[cnt_set][IFS_TX][IFS_PROTO_OTHER].bytes,

		cnts->bpc[cnt_set][IFS_TX][IFS_PROTO_OTHER].packets);

	return ret ?: 1;

	return seq_has_overflowed(m) ? -ENOSPC : 1;

}



static bool pp_sets(struct seq_file *m, struct tag_stat *ts_entry)