misc seq_printf fixes for 4.4

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

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

diff --git a/drivers/misc/uid_stat.c b/drivers/misc/uid_stat.c
index 4766c1f83b94ee6bddebdfd7527ca273634e5937..8b8c9a22360be35d51890f8fcab34e2cee9443a3 100644 (file)
--- a/drivers/misc/uid_stat.c
+++ b/drivers/misc/uid_stat.c
@@ -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)

diff --git a/net/activity_stats.c b/net/activity_stats.c
index 4609ce2043eb3677905b5ad5decc803e9cd40b7b..3bf92d80b8b93f7825a3a8005b2b7261d73bf3cc 100644 (file)
--- a/net/activity_stats.c
+++ b/net/activity_stats.c
@@ -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;

diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index 04bb081adde87168ff685e888fb52d95c6617dfe..e1442bfb668dbaf9ecd3f7f425cc70a49b500a1a 100644 (file)
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -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)