From: Amit Pundir <amit.pundir@linaro.org>
Date: Mon, 25 Apr 2016 11:30:08 +0000 (+0530)
Subject: Revert "misc seq_printf fixes for 4.4"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cdb6973ae15c5f62947ea7afc29fc1175ecb3172;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Revert "misc seq_printf fixes for 4.4"

This reverts commit 5c7566a29bff14166d952f2ea525d5231546f821.

This patch revert some changes in net/netfilter/xt_qtaguid.c as well.
I'll submit another patch to restore those changes.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---

diff --git a/drivers/misc/uid_stat.c b/drivers/misc/uid_stat.c
index 8b8c9a22360b..4766c1f83b94 100644
--- a/drivers/misc/uid_stat.c
+++ b/drivers/misc/uid_stat.c
@@ -55,8 +55,7 @@ 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);
-	seq_printf(m, "%u\n", bytes);
-	return seq_has_overflowed(m) ? -ENOSPC : 0;
+	return seq_printf(m, "%u\n", bytes);
 }
 
 static int uid_stat_read_atomic_int_open(struct inode *inode, struct file *file)
diff --git a/net/activity_stats.c b/net/activity_stats.c
index 3bf92d80b8b9..4609ce2043eb 100644
--- a/net/activity_stats.c
+++ b/net/activity_stats.c
@@ -63,13 +63,14 @@ 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++) {
-		seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);
-		if (seq_has_overflowed(m))
-			return -ENOSPC;
+		ret = seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);
+		if (ret)
+			return ret;
 	}
 
 	return 0;
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index e1442bfb668d..04bb081adde8 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -2543,6 +2543,7 @@ 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);
@@ -2561,7 +2562,7 @@ static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry,
 	}
 	ppi->item_index++;
 	cnts = &ts_entry->counters;
-	seq_printf(m, "%d %s 0x%llx %u %u "
+	ret = seq_printf(m, "%d %s 0x%llx %u %u "
 		"%llu %llu "
 		"%llu %llu "
 		"%llu %llu "
@@ -2591,7 +2592,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 seq_has_overflowed(m) ? -ENOSPC : 1;
+	return ret ?: 1;
 }
 
 static bool pp_sets(struct seq_file *m, struct tag_stat *ts_entry)