Merge "Revert "misc: uidstat: Remove use of obsolete create_proc_read_entry api""

drivers/misc/uid_stat.c

@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/stat.h>
@@ -49,27 +48,41 @@ static struct uid_stat *find_uid_stat(uid_t uid) {
 	return NULL;
 }
 
-static int uid_stat_atomic_int_show(struct seq_file *m, void *v)
+static int tcp_snd_read_proc(char *page, char **start, off_t off,
+				int count, int *eof, void *data)
 {
+	int len;
 	unsigned int bytes;
-	atomic_t *counter = m->private;
+	char *p = page;
+	struct uid_stat *uid_entry = (struct uid_stat *) data;
+	if (!data)
+		return 0;
 
-	bytes = (unsigned int) (atomic_read(counter) + INT_MIN);
+	bytes = (unsigned int) (atomic_read(&uid_entry->tcp_snd) + INT_MIN);
-	seq_printf(m, "%u\n", bytes);
+	p += sprintf(p, "%u\n", bytes);
-	return seq_has_overflowed(m) ? -ENOSPC : 0;
+	len = (p - page) - off;
+	*eof = (len <= count) ? 1 : 0;
+	*start = page + off;
+	return len;
 }
 
-static int uid_stat_read_atomic_int_open(struct inode *inode, struct file *file)
+static int tcp_rcv_read_proc(char *page, char **start, off_t off,
+				int count, int *eof, void *data)
 {
-	return single_open(file, uid_stat_atomic_int_show, PDE_DATA(inode));
+	int len;
-}
+	unsigned int bytes;
+	char *p = page;
+	struct uid_stat *uid_entry = (struct uid_stat *) data;
+	if (!data)
+		return 0;
 
-static const struct file_operations uid_stat_read_atomic_int_fops = {
+	bytes = (unsigned int) (atomic_read(&uid_entry->tcp_rcv) + INT_MIN);
-	.open		= uid_stat_read_atomic_int_open,
+	p += sprintf(p, "%u\n", bytes);
-	.read		= seq_read,
+	len = (p - page) - off;
-	.llseek		= seq_lseek,
+	*eof = (len <= count) ? 1 : 0;
-	.release	= seq_release,
+	*start = page + off;
-};
+	return len;
+}
 
 /* Create a new entry for tracking the specified uid. */
 static struct uid_stat *create_stat(uid_t uid) {
@@ -96,11 +109,11 @@ static void create_stat_proc(struct uid_stat *new_uid)
 	entry = proc_mkdir(uid_s, parent);
 
 	/* Keep reference to uid_stat so we know what uid to read stats from. */
-	proc_create_data("tcp_snd", S_IRUGO, entry,
+	create_proc_read_entry("tcp_snd", S_IRUGO, entry , tcp_snd_read_proc,
-			 &uid_stat_read_atomic_int_fops, &new_uid->tcp_snd);
+		(void *) new_uid);
 
-	proc_create_data("tcp_rcv", S_IRUGO, entry,
+	create_proc_read_entry("tcp_rcv", S_IRUGO, entry, tcp_rcv_read_proc,
-			 &uid_stat_read_atomic_int_fops, &new_uid->tcp_rcv);
+		(void *) new_uid);
 }
 
 static struct uid_stat *find_or_create_uid_stat(uid_t uid)

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]);
+		ret = seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);
-		if (seq_has_overflowed(m))
+		if (ret)
-			return -ENOSPC;
+			return ret;
 	}
 
 	return 0;

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)