netfilter: xt_qtaguid: seq_printf fixes
authorAmit Pundir <amit.pundir@linaro.org>
Thu, 1 Oct 2015 05:14:36 +0000 (10:44 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 25 Apr 2016 16:49:46 +0000 (22:19 +0530)
Update seq_printf() usage in xt_qtaguid 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>
net/netfilter/xt_qtaguid.c

index 04bb081adde87168ff685e888fb52d95c6617dfe..e1442bfb668dbaf9ecd3f7f425cc70a49b500a1a 100644 (file)
@@ -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)